From 9d92d2cc8d59a04103e92dd5ba97d48efc71dca4 Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Tue, 28 Jun 2022 13:14:15 -0700 Subject: [PATCH] gprofng: fix build when BUILD_MAN is false gprofng/ChangeLog 2022-06-28 Vladimir Mezentsev PR gprofng/29131 * gp-display-html/Makefile.am: Set man_MANS only when BUILD_MAN is true. * src/Makefile.am: Likewise. * gp-display-html/Makefile.in: Rebuild. * src/Makefile.in: Rebuild. --- gprofng/gp-display-html/Makefile.am | 5 +++-- gprofng/gp-display-html/Makefile.in | 15 +++++++-------- gprofng/src/Makefile.am | 16 ++++++++-------- gprofng/src/Makefile.in | 14 +++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gprofng/gp-display-html/Makefile.am b/gprofng/gp-display-html/Makefile.am index 7fc27d13e17..f933911d11c 100644 --- a/gprofng/gp-display-html/Makefile.am +++ b/gprofng/gp-display-html/Makefile.am @@ -19,10 +19,8 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../.. -dist_man_MANS = gp-display-html.1 bin_SCRIPTS = gp-display-html CLEANFILES = $(bin_SCRIPTS) -MAINTAINERCLEANFILES = $(dist_man_MANS) do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/' @@ -32,6 +30,9 @@ gp-display-html: gp-display-html.in Makefile if BUILD_MAN +man_MANS = gp-display-html.1 +MAINTAINERCLEANFILES = $(man_MANS) + # Use this if the man pages depend on the version number. # common_mandeps = $(top_srcdir)/../bfd/version.m4 # diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in index a222b955343..1206a79d3f0 100644 --- a/gprofng/gp-display-html/Makefile.in +++ b/gprofng/gp-display-html/Makefile.in @@ -173,10 +173,9 @@ am__can_run_installinfo = \ esac man1dir = $(mandir)/man1 NROFF = nroff -MANS = $(dist_man_MANS) +MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ - $(top_srcdir)/../mkinstalldirs +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -326,11 +325,11 @@ zlibdir = @zlibdir@ zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../.. -dist_man_MANS = gp-display-html.1 bin_SCRIPTS = gp-display-html CLEANFILES = $(bin_SCRIPTS) -MAINTAINERCLEANFILES = $(dist_man_MANS) do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/' +@BUILD_MAN_TRUE@man_MANS = gp-display-html.1 +@BUILD_MAN_TRUE@MAINTAINERCLEANFILES = $(man_MANS) # Use this if the man pages depend on the version number. # common_mandeps = $(top_srcdir)/../bfd/version.m4 @@ -423,10 +422,10 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-man1: $(dist_man_MANS) +install-man1: $(man_MANS) @$(NORMAL_INSTALL) @list1=''; \ - list2='$(dist_man_MANS)'; \ + list2='$(man_MANS)'; \ test -n "$(man1dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -461,7 +460,7 @@ uninstall-man1: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man1dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index bcdd03bfae6..2584a67dc55 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -120,14 +120,6 @@ AM_CXXFLAGS = $(AM_CFLAGS) QLParser.tab.cc QLParser.tab.hh: QLParser.yy $(BISON) $^ -man_MANS = gprofng.1 \ - gp-archive.1 \ - gp-collect-app.1 \ - gp-display-src.1 \ - gp-display-text.1 - -MAINTAINERCLEANFILES = $(man_MANS) - BUILT_SOURCES = QLParser.tab.hh EXTRA_DIST = QLParser.yy $(man_MANS) @@ -164,6 +156,14 @@ gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) if BUILD_MAN +man_MANS = gprofng.1 \ + gp-archive.1 \ + gp-collect-app.1 \ + gp-display-src.1 \ + gp-display-text.1 + +MAINTAINERCLEANFILES = $(man_MANS) + # The man pages depend on the version number and on a help2man include file. common_mandeps = $(top_srcdir)/../bfd/version.m4 diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index 27747708861..3d15496147e 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -547,13 +547,6 @@ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_SWITCH_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS) -man_MANS = gprofng.1 \ - gp-archive.1 \ - gp-collect-app.1 \ - gp-display-src.1 \ - gp-display-text.1 - -MAINTAINERCLEANFILES = $(man_MANS) BUILT_SOURCES = QLParser.tab.hh EXTRA_DIST = QLParser.yy $(man_MANS) pkglib_LTLIBRARIES = $(LIBGPROFNG) @@ -576,6 +569,13 @@ gp_display_src_SOURCES = gp-display-src.cc gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) +@BUILD_MAN_TRUE@man_MANS = gprofng.1 \ +@BUILD_MAN_TRUE@ gp-archive.1 \ +@BUILD_MAN_TRUE@ gp-collect-app.1 \ +@BUILD_MAN_TRUE@ gp-display-src.1 \ +@BUILD_MAN_TRUE@ gp-display-text.1 + +@BUILD_MAN_TRUE@MAINTAINERCLEANFILES = $(man_MANS) # The man pages depend on the version number and on a help2man include file. @BUILD_MAN_TRUE@common_mandeps = $(top_srcdir)/../bfd/version.m4 -- 2.30.2