Push EXTRA_DIST entries into the lowest-level Makefile.am available.

svn path=/trunk/; revision=25661

3 files changed, 26 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index 9e4bd695c7..832b95c2d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -745,31 +745,7 @@ EXTRA_DIST = \
 	text2pcap-scanner.l	\
 	text2pcap.c		\
 	text2pcap.h		\
-	packaging/makefile.nmake	\
-	packaging/ws-manifest.pl	\
-	packaging/portableapps/win32/Installer.nsi		\
-	packaging/portableapps/win32/WiresharkPortable.ini	\
-	packaging/portableapps/win32/WiresharkPortable.nsi	\
-	packaging/portableapps/win32/appinfo.tmpl		\
-	packaging/portableapps/win32/makefile.nmake		\
-	packaging/portableapps/win32/makenmake.pl		\
-	packaging/portableapps/win32/readme.txt			\
-	packaging/u3/win32/README.txt		\
-	packaging/u3/win32/makefile.nmake	\
-	packaging/u3/win32/makenmake.pl		\
-	packaging/u3/win32/manifest.tmpl	\
-	packaging/u3/win32/u3util.c		\
-	packaging/u3/win32/wireshark.bat	\
-	packaging/u3/tools/README.txt		\
-	packaging/u3/tools/makefile.nmake	\
-	packaging/u3/tools/sysdep.c		\
-	packaging/u3/tools/sysdep.h		\
-	packaging/u3/tools/utest.c		\
-	packaging/u3/tools/uuid.c		\
-	packaging/u3/tools/uuid.h		\
 	services		\
-	tools/idl2wrs.sh.in	\
-	tools/setuid-root.pl.in	\
 	wka.tmpl
 
 if SETUID_INSTALL
diff --git a/packaging/Makefile.am b/packaging/Makefile.am
index a6b7d71670..4819056f78 100644
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@@ -3,3 +3,27 @@ SUBDIRS = macosx rpm svr4 nsis
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
+EXTRA_DIST = \
+	makefile.nmake	\
+	ws-manifest.pl	\
+	portableapps/win32/Installer.nsi		\
+	portableapps/win32/WiresharkPortable.ini	\
+	portableapps/win32/WiresharkPortable.nsi	\
+	portableapps/win32/appinfo.tmpl		\
+	portableapps/win32/makefile.nmake		\
+	portableapps/win32/makenmake.pl		\
+	portableapps/win32/readme.txt			\
+	u3/win32/README.txt		\
+	u3/win32/makefile.nmake	\
+	u3/win32/makenmake.pl		\
+	u3/win32/manifest.tmpl	\
+	u3/win32/u3util.c		\
+	u3/win32/wireshark.bat	\
+	u3/tools/README.txt		\
+	u3/tools/makefile.nmake	\
+	u3/tools/sysdep.c		\
+	u3/tools/sysdep.h		\
+	u3/tools/utest.c		\
+	u3/tools/uuid.c		\
+	u3/tools/uuid.h
+
diff --git a/tools/Makefile.am b/tools/Makefile.am
index fd258dba77..f2637409c8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -90,6 +90,7 @@ EXTRA_DIST = \
 	dfilter-test.py 				\
 	fuzz-test.sh					\
 	idl2wrs.sh					\
+	idl2wrs.sh.in					\
 	lex.py						\
 	make-dissector-reg				\
 	make-dissector-reg.py				\
@@ -97,6 +98,7 @@ EXTRA_DIST = \
 	netscreen2dump.py				\
 	pkt-from-core.py				\
 	runlex.sh					\
+	setuid-root.pl.in				\
 	unix2dos.pl					\
 	win32-setup.sh					\
 	wireshark_be.py					\
@@ -120,4 +122,3 @@ DISTCLEANFILES = \
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
-