From 9764cd0a830e87c8acf13b4d494ea7fe4df72f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sun, 15 Oct 2017 14:35:06 +0100 Subject: autotools: make maintainer-clean should allow rerunning 'configure' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- packaging/Makefile.am | 5 +---- packaging/macosx/Makefile.am | 2 -- packaging/nsis/Makefile.am | 2 -- packaging/rpm/Makefile.am | 3 --- packaging/rpm/SPECS/Makefile.am | 2 -- packaging/wix/Makefile.am | 2 -- 6 files changed, 1 insertion(+), 15 deletions(-) (limited to 'packaging') diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 4b6367eec8..2342f81b8e 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -1,8 +1,5 @@ -# -SUBDIRS = macosx rpm nsis wix -MAINTAINERCLEANFILES = \ - Makefile.in +SUBDIRS = macosx rpm nsis wix EXTRA_DIST = \ portableapps/appinfo.tmpl \ diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am index b025f8600d..d148c3e412 100644 --- a/packaging/macosx/Makefile.am +++ b/packaging/macosx/Makefile.am @@ -8,8 +8,6 @@ # remove the entries for this Makefile.am and Info.plist from AC_OUTPUT # in ../../configure.in. # -MAINTAINERCLEANFILES = \ - Makefile.in EXTRA_DIST = \ ChmodBPF/ChmodBPF \ diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index a02722a44f..a35732740d 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -1,5 +1,3 @@ -MAINTAINERCLEANFILES = \ - Makefile.in EXTRA_DIST = \ AdditionalTasksPage.ini \ diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am index 0ebfb7f1b1..5282dd2934 100644 --- a/packaging/rpm/Makefile.am +++ b/packaging/rpm/Makefile.am @@ -1,7 +1,4 @@ SUBDIRS = SPECS -MAINTAINERCLEANFILES = \ - Makefile.in - clean-local: rm -rf BUILD RPMS SOURCES SRPMS diff --git a/packaging/rpm/SPECS/Makefile.am b/packaging/rpm/SPECS/Makefile.am index 71179fac5e..27ab46038b 100644 --- a/packaging/rpm/SPECS/Makefile.am +++ b/packaging/rpm/SPECS/Makefile.am @@ -1,4 +1,2 @@ -MAINTAINERCLEANFILES = \ - Makefile.in EXTRA_DIST = wireshark.spec.in diff --git a/packaging/wix/Makefile.am b/packaging/wix/Makefile.am index ce663a213c..61be5ff027 100644 --- a/packaging/wix/Makefile.am +++ b/packaging/wix/Makefile.am @@ -1,5 +1,3 @@ -MAINTAINERCLEANFILES = \ - Makefile.in EXTRA_DIST = \ CMakeLists.txt \ -- cgit v1.2.3