From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2041) id E59BD3856DF6; Wed, 29 Jun 2022 04:37:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E59BD3856DF6 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Vladimir Mezentsev To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] gprofng: fix build when BUILD_MAN is false X-Act-Checkin: binutils-gdb X-Git-Author: Vladimir Mezentsev X-Git-Refname: refs/heads/master X-Git-Oldrev: 6284f0aa11381a472d7f0ecac6b24b989d2c12db X-Git-Newrev: 9d92d2cc8d59a04103e92dd5ba97d48efc71dca4 Message-Id: <20220629043726.E59BD3856DF6@sourceware.org> Date: Wed, 29 Jun 2022 04:37:26 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 04:37:27 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9d92d2cc8d59= a04103e92dd5ba97d48efc71dca4 commit 9d92d2cc8d59a04103e92dd5ba97d48efc71dca4 Author: Vladimir Mezentsev Date: Tue Jun 28 13:14:15 2022 -0700 gprofng: fix build when BUILD_MAN is false =20 gprofng/ChangeLog 2022-06-28 Vladimir Mezentsev =20 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. Diff: --- 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 =3D foreign ACLOCAL_AMFLAGS =3D -I . -I .. -I ../..=20 =20 -dist_man_MANS =3D gp-display-html.1 bin_SCRIPTS =3D gp-display-html CLEANFILES =3D $(bin_SCRIPTS) -MAINTAINERCLEANFILES =3D $(dist_man_MANS) =20 do_subst =3D sed -e 's/BINUTILS_VERSION/$(VERSION)/' =20 @@ -32,6 +30,9 @@ gp-display-html: gp-display-html.in Makefile =20 if BUILD_MAN =20 +man_MANS =3D gp-display-html.1 +MAINTAINERCLEANFILES =3D $(man_MANS) + # Use this if the man pages depend on the version number.=20 # common_mandeps =3D $(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 =3D \ esac man1dir =3D $(mandir)/man1 NROFF =3D nroff -MANS =3D $(dist_man_MANS) +MANS =3D $(man_MANS) am__tagged_files =3D $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON =3D $(dist_man_MANS) $(srcdir)/Makefile.in \ - $(top_srcdir)/../mkinstalldirs +am__DIST_COMMON =3D $(srcdir)/Makefile.in $(top_srcdir)/../mkinstalldirs DISTFILES =3D $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ @@ -326,11 +325,11 @@ zlibdir =3D @zlibdir@ zlibinc =3D @zlibinc@ AUTOMAKE_OPTIONS =3D foreign ACLOCAL_AMFLAGS =3D -I . -I .. -I ../..=20 -dist_man_MANS =3D gp-display-html.1 bin_SCRIPTS =3D gp-display-html CLEANFILES =3D $(bin_SCRIPTS) -MAINTAINERCLEANFILES =3D $(dist_man_MANS) do_subst =3D sed -e 's/BINUTILS_VERSION/$(VERSION)/' +@BUILD_MAN_TRUE@man_MANS =3D gp-display-html.1 +@BUILD_MAN_TRUE@MAINTAINERCLEANFILES =3D $(man_MANS) =20 # Use this if the man pages depend on the version number.=20 # common_mandeps =3D $(top_srcdir)/../bfd/version.m4 @@ -423,10 +422,10 @@ mostlyclean-libtool: =20 clean-libtool: -rm -rf .libs _libs -install-man1: $(dist_man_MANS) +install-man1: $(man_MANS) @$(NORMAL_INSTALL) @list1=3D''; \ - list2=3D'$(dist_man_MANS)'; \ + list2=3D'$(man_MANS)'; \ test -n "$(man1dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -461,7 +460,7 @@ uninstall-man1: @$(NORMAL_UNINSTALL) @list=3D''; test -n "$(man1dir)" || exit 0; \ files=3D`{ for i in $$list; do echo "$$i"; done; \ - l2=3D'$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2=3D'$(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 =3D $(AM_CFLAGS) QLParser.tab.cc QLParser.tab.hh: QLParser.yy $(BISON) $^ =20 -man_MANS =3D gprofng.1 \ - gp-archive.1 \ - gp-collect-app.1 \ - gp-display-src.1 \ - gp-display-text.1 - -MAINTAINERCLEANFILES =3D $(man_MANS) - BUILT_SOURCES =3D QLParser.tab.hh EXTRA_DIST =3D QLParser.yy $(man_MANS) =20 @@ -164,6 +156,14 @@ gp_display_text_LDADD =3D $(LIBGPROFNG) $(CLOCK_GETTIM= E_LINK) $(ZLIB) =20 if BUILD_MAN =20 +man_MANS =3D gprofng.1 \ + gp-archive.1 \ + gp-collect-app.1 \ + gp-display-src.1 \ + gp-display-text.1 + +MAINTAINERCLEANFILES =3D $(man_MANS) + # The man pages depend on the version number and on a help2man include fil= e. common_mandeps =3D $(top_srcdir)/../bfd/version.m4 =20 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 =3D $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_SWITCH_CFLAGS) =20 AM_CXXFLAGS =3D $(AM_CFLAGS) -man_MANS =3D gprofng.1 \ - gp-archive.1 \ - gp-collect-app.1 \ - gp-display-src.1 \ - gp-display-text.1 - -MAINTAINERCLEANFILES =3D $(man_MANS) BUILT_SOURCES =3D QLParser.tab.hh EXTRA_DIST =3D QLParser.yy $(man_MANS) pkglib_LTLIBRARIES =3D $(LIBGPROFNG) @@ -576,6 +569,13 @@ gp_display_src_SOURCES =3D gp-display-src.cc gp_display_src_LDADD =3D $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_text_SOURCES =3D gp-display-text.cc ipc.cc ipcio.cc gp_display_text_LDADD =3D $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) +@BUILD_MAN_TRUE@man_MANS =3D 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 =3D $(man_MANS) =20 # The man pages depend on the version number and on a help2man include fil= e. @BUILD_MAN_TRUE@common_mandeps =3D $(top_srcdir)/../bfd/version.m4