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

svn path=/trunk/; revision=25661

diff --git a/Makefile.am b/Makefile.am
index 9e4bd695c75db7bfad5ff90076e9388818f4c3c7..832b95c2d4863f28e6c2fd816f0cc86dca035e74 100644 (file)
--- 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 a6b7d71670577faf51b93fd2a2cdeb788d028cce..4819056f7847636fa166fe4a17067c5d7f3ad464 100644 (file)
--- 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 fd258dba77d440fedb2db50042806b8c38dfbbab..f2637409c8822cde2f3bedb32db8c6850d0bbcb9 100644 (file)
--- 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
-