From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 119BB3856DCF for ; Tue, 28 Jun 2022 20:16:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 119BB3856DCF Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25SJBWWg012398 for ; Tue, 28 Jun 2022 20:16:39 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gwtwu77gf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jun 2022 20:16:38 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25SK6p4B020305 for ; Tue, 28 Jun 2022 20:16:38 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gwrt2pess-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jun 2022 20:16:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FJM8YXYllFCfH1p04YSirW24p8c4DXI1Ua6uCER109Frap7zfTRcifz2iC60GF/SGwsv1DooZUHcDgZaxNTNGFlPlms2pEccd8+LW/R9uIl0zPRSmolImmsRokmJD20pznAMNi9EMxFsrfmBWomvmYn+zMYZXvn5aFqQhLIeMJbipaQ8wjwDM37HIYWWu/r9aD5ZmdE3KAR9aX5TtE12xpXJZH83/rZGCac7ry3iMWKnXF2GjWDcLNgeOokYnpZ5x78BTAlZbXX8NXlrxBw/1w+MiSxqY9wZXMLoPpH72p9qUkq/GpM4uA2ibaWxpMkJXog240EiOLndmv0y9l0YqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MkcZV+IX/fl52GqzfIZmrLrfjO9DEgk95R6/tj28YAE=; b=Zr4nXv/+qXs3WPRKCcfm2vW7PY3XjKYdQg2rXq1BX9/By59/f7nnpwYm1bixCO+zUmxWw7bOSDVPD2Uja+pSS4JdXoTFdo8fZ4fgXwJDzqOscw1m5C54DnTK1Zgx/mVlPjfP1Q/YIX5FRJFqzaOqz/pYWHl++BBhUANsliRA6p9wMj/RXRofpZ2Xsq2+nAu1azweOq+dlVBag/vSpSEI/GCmWU1Lr06Ne4oVbWQJ92RocNQopg/xs1O4uYCxUlo+mHkkNpbb2RsFAyoKYuZqc2UOlreG9OZS1WEnD8pHwGJQap3Y5GUd7e/nrZWbo5Rk23zAwgFFFfWH6ccwi0aZ1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by PH0PR10MB5683.namprd10.prod.outlook.com (2603:10b6:510:148::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Tue, 28 Jun 2022 20:16:36 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::cc8d:db23:414b:ce5f]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::cc8d:db23:414b:ce5f%5]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 20:16:36 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH 2/2] gprofng: fix build when BUILD_MAN is false Date: Tue, 28 Jun 2022 13:16:29 -0700 Message-Id: <20220628201629.427138-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ0PR13CA0136.namprd13.prod.outlook.com (2603:10b6:a03:2c6::21) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 632bac06-8159-4787-786f-08da59431a09 X-MS-TrafficTypeDiagnostic: PH0PR10MB5683:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NfnH/zDl27SDe0vtI14DQhgEiOrlKe6kRuWz1FIgxiMs+uyOWgMlwZdW5t+6IbGu2i5DzTLmqXH1hv3nOvflgHH4mgtNYbuuJbNNyQpeHBvt0WDV15eBr1sgvSjxREhelj1iy6FnOw8z6VGH4HQnMIqdiMdu4SpKieOWFd8Fcxwu+/l7V29BG6DCTr5JQJAA99Vgyh41apbk8cLDFTHyfnDoy8/uKkb2cMhS3DL8sUTfNKGoz3j9gVp//sSjIFzZ/4PI8NizcqCDw+mZrsaxA7SJdn7OqGPGgdX3D2I11L5DcxNhBiFePK3Va6BJcqcvGpk0IjtwL4tBd4iTuUfb3swg4pdGHB7etD+bRPlQCOR/9x4XY2/FxEKMu3Te3MObrZBt+BhWL0/yLY/8+VGzvIzev4uPE4KnLVPiDhxfWu1XQtByusDk853HbStxCHyixDFRY1GmBXgECM4tE4VNXgZnXr3LkUoZoQuuCAQSa+XItZwHoB1kn4rJU3/tHmEJlqijg22/DnOgg3gpWY54XvVTYpIAtjboEykExiAop4ftuT/YxWnjRNERnD7/6FqOvu7keamok7IdzQA/nSo1vRQOC8kc/jbB2SXoN7iD6RJJbMUdSiDkHzHPPUU64HGRSl+XWXFLN8Q9S3GdUl8A0xY6YVsu7JyNZGXQQtD83zAgZXzCTrPIqxg6Od34icpozg4swsuhLdAYv+SFZpDIcdd74ZurLGYDvpyjSfdQ4Zzm8syqDbdUJyotiW2btRO5KWbTXZaspAD9CrrPsk5E9jTUHKwnI2V5RmN1aBIxF6AR1dN9+Zhqd38l67Xqir9G X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4636.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(396003)(39860400002)(376002)(136003)(346002)(478600001)(316002)(9686003)(186003)(6486002)(66556008)(8936002)(1076003)(5660300002)(41300700001)(6512007)(2616005)(52116002)(2906002)(6506007)(86362001)(83380400001)(66476007)(6916009)(6666004)(66946007)(36756003)(38100700002)(8676002)(473944003)(414714003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2SGMnANJyeMrpAJDDkC4hYNWlmkzOp5NSFOHam1LGpapbdGhvVUwhJWA06K4?= =?us-ascii?Q?VHUJaTPAieLy+g1GsScUfpw7l7b2Mkssw6L9bo6xU0/LaRz8x88/K7wZzJ/A?= =?us-ascii?Q?2JbPVudCWSuF9PBt6x5viKzpWuGWALyQCt1iwmK6PdVW+pMrg7Hh10VRCRSX?= =?us-ascii?Q?IP25WbAxchIepXYyfeqbKgC6RwHLAcjV1psdADlCwVnnnZtYy3QMsQpSnarL?= =?us-ascii?Q?8FE7MrLqLDQTvQAqSMkbIFw9zF67gvQp6muFTs7vhcYCLVYdW/IPYvdPawvl?= =?us-ascii?Q?lWYhvygQvhnSJeDFlAUeumRNKJShWz8WipDh1JtmHcZ1j/x9b+dbXCuiDHZZ?= =?us-ascii?Q?lsy88FRD3/DPSazP132N5ipwBtbQkygpyk367QtAJzh1b3/K4oYEmZHW7qCd?= =?us-ascii?Q?h/cLdFTIoRtyTzwaDjAygS8Srgzm4qKXani90fjzKm4QUi6cRkjWu34KPy9H?= =?us-ascii?Q?9QT35OYKHaN++uajnXwXzMVV1UW/2bNZxzcu+nHrWpD+hk0n5jnsrQ2bX4e3?= =?us-ascii?Q?RdM1Th/Azt+0HUSBSwNUxNz7EGjq1lHlQK0q6TcDy6buZTk2ORniGoQBC5Yv?= =?us-ascii?Q?0jtx6vi4Dizml3l69brv2K4DLRkkL0iAnIz/oC1q2oFWa+veguwCGLJ9kRCM?= =?us-ascii?Q?7TgxDJtcI1XSGTK6TLVrnw9Lg7x/OYBuD/jQzcVKbMxsc2eE/gEANqhsLOMp?= =?us-ascii?Q?u1eUSgS/1mXk9fuVHhJ9vrAC+WbdOlIj1yRlkt9qlXWhsZk5ocK/QENKxWfN?= =?us-ascii?Q?F6dvdqeOr8A/voM4/NRuuXC8WG6sDiT6PQpoLOsXMcdXqkbCIn93QKFzHzCm?= =?us-ascii?Q?Xi0Ny6wbQ1zYUuzdiPk0/EZ4ncHlsB0I/R+fEFZbZWlWLDKa6YLvBdQ/MJ/L?= =?us-ascii?Q?MwN9W+zSoaIOonb5FGifHbimywjCv/3x89PSepWae7FPVC08T1RtRBAMyTmK?= =?us-ascii?Q?uV1qXoHjp10W4NKZ9N1v8KZ9vUTvh74lL+kwwF1unAY7Ki1of36KzcJ4TFPt?= =?us-ascii?Q?s8WBEv+/JSr/10JG5TJKBY1FyazvojyiWzeNiOqAxBs3zXU33y4zIrbsQhx5?= =?us-ascii?Q?kdePsgKL44FNHxUVmK7/vVr2tf+4CMylB9Au3kEpHIMkj2Yn/frOGl6ZfEvc?= =?us-ascii?Q?7Mb59HwjwzaVBdSxON06VeHsYkPLQcLrlCXe/m+yXWsqoYBcyq57Vn66QY3C?= =?us-ascii?Q?XqVvxTjoKwZRPVJJwLXGkml76m8F3PdNonoT3VQ++kIOU5c45TjyTZcj0UzJ?= =?us-ascii?Q?7sqzh8wXc53B7fkmZ3d8iXwXGJ+OmHi+6UQSTsMrZt+K+vpNiS+E3lSjVOdK?= =?us-ascii?Q?UgIfuMw2G/uNZpHBNrSxlZmq4oBei/NP1zMcrWy1dwc7wBdNxrJXjznqrAkE?= =?us-ascii?Q?Y1ZcnP3huodl566faLT0LTXIrl8Ew+wBtZynXl99/8RwfJFq7VQFkpPM8gz7?= =?us-ascii?Q?5fs3k82jKdfKMlzCJAEhHXOWvifeS+C0eM5YTMrU7AsiAun68xJwqMEka21Z?= =?us-ascii?Q?bMt8/KpJKwjBMmmtaY5XJCDlYtGDE9RwAc1C5A9L6VDYdny5vfznb7sOVPC/?= =?us-ascii?Q?MUlx4aS7ZuOaJUtwj2xAHpKG51htwss8GfuGLG0yWEj2mU5FwgI6t63L5zqN?= =?us-ascii?Q?shOFdfVQUHjZfdQviCKu6tIx23OmK6/29M4QhVHs5myz?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 632bac06-8159-4787-786f-08da59431a09 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 20:16:36.2886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2Z6Lz6FcU0A2YfqnSLfb4UpYTMmDr1wu4ZDCB5lgVWIsCVI6r+F+6jKxEhZJCD0diqzuMceK+QjTr3BVVtUnqbl6rN2Df/lOc2geQOYTwn4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5683 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517, 18.0.883 definitions=2022-06-28_11:2022-06-28, 2022-06-28 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206280080 X-Proofpoint-ORIG-GUID: 5kUsLW0WjoQFWnJ71GGoUsQqhxJcqpI3 X-Proofpoint-GUID: 5kUsLW0WjoQFWnJ71GGoUsQqhxJcqpI3 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jun 2022 20:16:42 -0000 From: Vladimir Mezentsev 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.27.0