From patchwork Mon Nov 18 18:12:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 101461 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 86D713858CD9 for ; Mon, 18 Nov 2024 18:13:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86D713858CD9 X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 5DD41385840C for ; Mon, 18 Nov 2024 18:12:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5DD41385840C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5DD41385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731953545; cv=none; b=KvBhnOnVEmbuMjTv36kPRzqrRRf9zhz5v199acRcCpchj5XzlETBX2a6P6nqUJYraQMduMrgQnJiMXaN1F6lpDYNnfmdyg20LGx+Sg+fcHjA3+s9FBrpdIVYeZU1oyotmE06IDIhd1aKpdJNaclKm9MR1QAVqBnN7IMq7HYmQic= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731953545; c=relaxed/simple; bh=nHNdtqg0XXby+KDZB77y3FwdPFG07U9gNAuD8B6Wp1A=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=LUi1pDGP+VmI2WYjavyGa8PGKkH893dnTxviMB4+POCjJw6mX2PHS9kbXmao7SVn3fs6Ama0e1mqRAjRNBoWl5ThIfU33lBNif1KUNJ4jFkjw72Aev8I8h5AvGs79tWvPutIaftM5K9ijrg+UU0ibMggzLfdYAnaA+0GGRxsi6U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DD41385840C Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 4B7DB303AA0D; Mon, 18 Nov 2024 19:12:21 +0100 (CET) Received: by r6.localdomain (Postfix, from userid 1000) id DB3E134037E; Mon, 18 Nov 2024 19:12:20 +0100 (CET) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Michael Pratt , Mark Wielaard Subject: [PATCH] Cleanup Makefile.am CLEANFILES definitions Date: Mon, 18 Nov 2024 19:12:09 +0100 Message-ID: <20241118181209.584091-1-mark@klomp.org> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP 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: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: elfutils-devel-bounces~patchwork=sourceware.org@sourceware.org Since b2f225d6bff8 ("Consolidate and add files to clean target variables") autoreconf (automake) produces these warnings: debuginfod/Makefile.am:130: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here debuginfod/Makefile.am:32: 'config/eu.am' included from here libasm/Makefile.am:91: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here libasm/Makefile.am:30: 'config/eu.am' included from here libcpu/Makefile.am:105: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here libcpu/Makefile.am:30: 'config/eu.am' included from here libdw/Makefile.am:156: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here libdw/Makefile.am:30: 'config/eu.am' included from here libelf/Makefile.am:142: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here libelf/Makefile.am:30: 'config/eu.am' included from here src/Makefile.am:47: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here src/Makefile.am:19: 'config/eu.am' included from here tests/Makefile.am:891: warning: CLEANFILES multiply defined in condition TRUE ... config/eu.am:138: ... 'CLEANFILES' previously defined here tests/Makefile.am:19: 'config/eu.am' included from here This is because config/eu.am defines a default CLEANFILES. So those Makefile.am files should add to CLEANFILES with += instead of redefining CLEANFILES with =. * debuginfod/Makefile.am (CLEANFILES): Use +=. * libasm/Makefile.am (CLEANFILES): Likewise. * libcpu/Makefile.am (CLEANFILES): Likewise. * libdw/Makefile.am (CLEANFILES): Likewise. * libelf/Makefile.am (CLEANFILES): Likewise. * src/Makefile.am (CLEANFILES): Likewise. * tests/Makefile.am (CLEANFILES): Likewise. Signed-off-by: Mark Wielaard --- debuginfod/Makefile.am | 2 +- libasm/Makefile.am | 2 +- libcpu/Makefile.am | 2 +- libdw/Makefile.am | 2 +- libelf/Makefile.am | 2 +- src/Makefile.am | 2 +- tests/Makefile.am | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debuginfod/Makefile.am b/debuginfod/Makefile.am index 45b5339f488c..1c35ae77c996 100644 --- a/debuginfod/Makefile.am +++ b/debuginfod/Makefile.am @@ -127,7 +127,7 @@ endif EXTRA_DIST = libdebuginfod.map MOSTLYCLEANFILES = $(am_libdebuginfod_a_OBJECTS) $(am_libdebuginfod_pic_a_OBJECTS) $(LIBDEBUGINFOD_SONAME) -CLEANFILES = libdebuginfod.so +CLEANFILES += libdebuginfod.so # automake std-options override: arrange to pass LD_LIBRARY_PATH installcheck-binPROGRAMS: $(bin_PROGRAMS) diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 324fd095a783..89650e675570 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -88,4 +88,4 @@ noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map MOSTLYCLEANFILES = $(am_libasm_a_OBJECTS) $(am_libasm_pic_a_OBJECTS) libasm.so.$(VERSION) -CLEANFILES = libasm.so +CLEANFILES += libasm.so diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 3283523781c0..c70b988f7e48 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -102,5 +102,5 @@ bpf_disasm_CFLAGS = -Wno-format-nonliteral EXTRA_DIST = defs/i386 MOSTLYCLEANFILES = $(am_libcpu_a_OBJECTS) $(am_libcpu_pic_a_OBJECTS) $(i386_gendis_OBJECTS) -CLEANFILES = $(foreach P,i386 x86_64,$P_defs $P.mnemonics) +CLEANFILES += $(foreach P,i386 x86_64,$P_defs $P.mnemonics) MAINTAINERCLEANFILES = $(foreach P,i386 x86_64, $P_defs $P_dis.h $P_parse.h) diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 62f4359e4c09..42b18ce23e85 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -153,5 +153,5 @@ noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h \ EXTRA_DIST = libdw.map MOSTLYCLEANFILES = $(am_libdw_a_OBJECTS) $(am_libdw_pic_a_OBJECTS) libdw.so.$(VERSION) -CLEANFILES = libdw.so +CLEANFILES += libdw.so MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h diff --git a/libelf/Makefile.am b/libelf/Makefile.am index e91bcd6e9ba1..603f797a3aa2 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -139,4 +139,4 @@ uninstall: uninstall-am EXTRA_DIST = libelf.map MOSTLYCLEANFILES = $(am_libelf_a_OBJECTS) $(am_libelf_pic_a_OBJECTS) libelf.so.$(VERSION) -CLEANFILES = libelf.so +CLEANFILES += libelf.so diff --git a/src/Makefile.am b/src/Makefile.am index 97a0c61aac59..4221d54e4e77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,7 +44,7 @@ bin_SCRIPTS = make-debug-archive EXTRA_DIST = arlib.h debugpred.h make-debug-archive.in MOSTLYCLEANFILES = *.gconv -CLEANFILES = $(bin_SCRIPTS) +CLEANFILES += $(bin_SCRIPTS) if BUILD_STATIC libasm = ../libasm/libasm.a diff --git a/tests/Makefile.am b/tests/Makefile.am index 44cbb8258e70..eed71df0b65a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -888,7 +888,7 @@ system_elf_gelf_test_LDADD = $(libelf) # A lock file used to make sure only one test dumps core at a time MOSTLYCLEANFILES = core-dump-backtrace.lock -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES += $(BUILT_SOURCES) if GCOV check: check-am coverage