From Roy Marples:

[obnox/wireshark/wip.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c334f6f2a0c550f336d7a1829b518b8e652b6ee9..cd75fc964ca292ea868b4211d22251941d9f2aa1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,15 +47,10 @@ bin_PROGRAMS = \
        @dftest_bin@    \
        @dumpcap_bin@   \
        @rawshark_bin@
-bin_SCRIPTS = @idl2wrs_bin@
 
 EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
        randpkt text2pcap dumpcap rawshark
-EXTRA_SCRIPTS = idl2wrs
-
-idl2wrs: tools/idl2wrs.sh Makefile
-       cp tools/idl2wrs.sh idl2wrs
-       chmod +x idl2wrs
+bin_SCRIPTS = tools/idl2wrs
 
 #
 # Wireshark configuration files are put in $(pkgdatadir).
@@ -269,8 +264,7 @@ tpncp_DATA = \
 #
 uidir = $(pkgdatadir)/ui
 ui_DATA = \
-       gtk/ui/tree-view-ui.xml
-       gtk/ui/bytes-view-ui.xml
+       gtk/ui/main-menubar-ui.xml
 
 #
 # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
@@ -529,24 +523,23 @@ ps.c: print.ps $(srcdir)/tools/rdps.py
 services: tools/make-services.pl
        $(PERL) $(srcdir)/tools/make-services.pl
 
-#
-# XXX - "svnversion.h" is distributed in the release tarball; should
-# we be deleting it with "make clean", or should we only do that with
-# "make maintainer-clean"?
-#
 CLEANFILES =           \
-       svnversion.h    \
-       idl2wrs         \
        *~              \
        vgcore.*
 
+#
+# We have to remove svnversion.h with "make distclean", as, otherwise,
+# "make distcheck" fails.  We still need to make the tarballs work
+# even if you do "make distclean" and try to rebuild; that's a work in
+# progress.
 #
 # XXX - "ps.c" is distributed in the source tarballs; why is it in the
 # list of files removed by "make distclean"?  (It's deliberately
 # included in that list.)
 #
 DISTCLEANFILES = \
-       ps.c
+       ps.c                    \
+       svnversion.h
 
 MAINTAINERCLEANFILES =         \
        $(GENERATED_FILES)      \
@@ -751,6 +744,10 @@ EXTRA_DIST = \
        image/toolbar/network_virtual_16.xpm    \
        image/toolbar/network_wired_16.png      \
        image/toolbar/network_wireless_16.png   \
+       image/toolbar/pipe_16.png       \
+       image/toolbar/remote_arrow_16.png       \
+       image/toolbar/remote_globe_16.png       \
+       image/toolbar/remote_sat_16.png \
        image/toolbar/resize_columns_24.xpm     \
        image/toolbar/telephone_16.xpm  \
        image/toolbar/telephony_16.xpm  \
@@ -811,7 +808,7 @@ EXTRA_DIST = \
        $(dtds_DATA)            \
        $(radius_DATA)          \
        $(tpncp_DATA)           \
-       $(ui_DATA)                      \
+       $(ui_DATA)              \
        $(wimaxasncp_DATA)      \
        randpkt.c               \
        smi_modules             \
@@ -867,16 +864,16 @@ EXTRA_DIST = \
        cmake/modules/UseMakeDissectorReg.cmake \
        cmake/modules/UseMakeTapReg.cmake       \
        cmake/modules/readme.txt                \
-       win32/Makefile.nmake    \
-       win32/file_dlg_win32.c          \
-       win32/file_dlg_win32.h          \
+       win32/Makefile.nmake                    \
+       win32/file_dlg_win32.c                  \
+       win32/file_dlg_win32.h                  \
        win32/print_win32.c                     \
        win32/print_win32.h                     \
        CPackConfig.txt                         \
-       all.vcproj              \
-       dumpcap.vcproj          \
-       packaging.vcproj        \
-       tshark.vcproj           \
+       all.vcproj                              \
+       dumpcap.vcproj                          \
+       packaging.vcproj                        \
+       tshark.vcproj                           \
        wireshark.vcproj
 
 install-exec-hook: