git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update:
[obnox/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 910a23e7429d4dd266ee83c1fc66ba3a41d26dd1..3348ee20dc908481a0337994672ae8c78fe72938 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).
@@ -263,6 +258,13 @@ tpncpdir = $(pkgdatadir)/tpncp
 tpncp_DATA = \
        tpncp/tpncp.dat
 
+#
+# Install the ui directory files in the "ui" subdirectory
+# of that directory
+#
+uidir = $(pkgdatadir)/ui
+ui_DATA = \
+       ui/gtk/ui/main-menubar-ui.xml
 
 #
 # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
@@ -321,15 +323,14 @@ endif
 # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
 # applications are X applications).
 wireshark_LDADD = \
-       gtk/libui.a                     \
-       gtk/libui_dirty.a               \
+       ui/gtk/libui.a                  \
+       ui/gtk/libui_dirty.a            \
        codecs/libcodec.a               \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @SSL_LIBS@                      \
+       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @PCAP_LIBS@                     \
        @GTK_LIBS@ -lm                  \
        @C_ARES_LIBS@                   \
@@ -357,7 +358,6 @@ tshark_LDADD = \
        wsutil/libwsutil.la             \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
@@ -385,7 +385,6 @@ rawshark_LDADD = \
        wsutil/libwsutil.la             \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
@@ -452,7 +451,6 @@ dftest_LDADD = \
        epan/libwireshark.la            \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
@@ -525,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)      \
@@ -585,8 +582,8 @@ EXTRA_DIST = \
        capture-wpcap.h         \
        capture_wpcap_packet.c  \
        capture_wpcap_packet.h  \
-       cfilters                \
-       colorfilters            \
+       cfilters                \
+       colorfilters            \
        config.h.win32          \
        config.nmake            \
        debian/changelog        \
@@ -619,7 +616,7 @@ EXTRA_DIST = \
        debian/wireshark.manpages \
        debian/wireshark.menu   \
        epan/dfilter/README.dfilter     \
-       dfilters                \
+       dfilters                \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
@@ -747,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  \
@@ -796,6 +797,7 @@ EXTRA_DIST = \
        macosx-setup.sh         \
        macosx-support-lib-patches/glib-gconvert.patch \
        macosx-support-lib-patches/glib-pkgconfig.patch \
+       macosx-support-lib-patches/gnutls-pkgconfig.patch \
        make-version.pl         \
        manuf                   \
        manuf.tmpl              \
@@ -806,6 +808,7 @@ EXTRA_DIST = \
        $(dtds_DATA)            \
        $(radius_DATA)          \
        $(tpncp_DATA)           \
+       $(ui_DATA)              \
        $(wimaxasncp_DATA)      \
        randpkt.c               \
        smi_modules             \
@@ -822,55 +825,55 @@ EXTRA_DIST = \
        wiretap/CMakeLists.txt  \
        README.cmake            \
        ConfigureChecks.cmake   \
-       cmake/modules/readme.txt                \
-       cmake/modules/FindLYNX.cmake            \
-       cmake/modules/FindYACC.cmake            \
+       cmake/modules/CMakeInstallDirs.cmake    \
+       cmake/modules/COPYING-CMAKE-SCRIPTS     \
+       cmake/modules/CheckCLinkerFlag.cmake    \
        cmake/modules/FeatureSummary.cmake      \
        cmake/modules/FindADNS.cmake            \
        cmake/modules/FindCAP.cmake             \
-       cmake/modules/UseLemon.cmake            \
-       cmake/modules/FindPCRE.cmake            \
-       cmake/modules/FindZLIB.cmake            \
-       cmake/modules/FindPORTAUDIO.cmake       \
-       cmake/modules/FindPCAP.cmake            \
-       cmake/modules/FindSMI.cmake             \
        cmake/modules/FindCARES.cmake           \
-       cmake/modules/FindXSLTPROC.cmake        \
-       cmake/modules/FindSH.cmake              \
-       cmake/modules/FindGNUTLS.cmake          \
+       cmake/modules/FindFOP.cmake             \
        cmake/modules/FindGCRYPT.cmake          \
-       cmake/modules/UseMakeDissectorReg.cmake \
-       cmake/modules/FindLEX.cmake             \
-       cmake/modules/FindPYTHON.cmake          \
-       cmake/modules/FindLUA.cmake             \
-       cmake/modules/FindYAPP.cmake            \
        cmake/modules/FindGEOIP.cmake           \
-       cmake/modules/FindXMLLINT.cmake         \
-       cmake/modules/FindSED.cmake             \
        cmake/modules/FindGLIB2.cmake           \
-       cmake/modules/FindGMODULE2.cmake                \
-       cmake/modules/FindGTHREAD2.cmake                \
-       cmake/modules/FindHtmlViewer.cmake      \
+       cmake/modules/FindGMODULE2.cmake        \
+       cmake/modules/FindGNUTLS.cmake          \
+       cmake/modules/FindGTHREAD2.cmake        \
        cmake/modules/FindGTK2.cmake            \
-       cmake/modules/FindFOP.cmake             \
-       cmake/modules/LICENSE.txt               \
-       cmake/modules/CMakeInstallDirs.cmake    \
-       cmake/modules/CheckCLinkerFlag.cmake    \
-       cmake/modules/COPYING-CMAKE-SCRIPTS     \
-       cmake/modules/UseMakeTapReg.cmake       \
-       cmake/modules/FindM.cmake               \
+       cmake/modules/FindGTK3.cmake            \
+       cmake/modules/FindHtmlViewer.cmake      \
        cmake/modules/FindKERBEROS.cmake        \
+       cmake/modules/FindLEX.cmake             \
+       cmake/modules/FindLUA.cmake             \
+       cmake/modules/FindLYNX.cmake            \
+       cmake/modules/FindM.cmake               \
+       cmake/modules/FindPCAP.cmake            \
        cmake/modules/FindPOD.cmake             \
-       win32/Makefile.nmake    \
-       win32/file_dlg_win32.c          \
-       win32/file_dlg_win32.h          \
-       win32/print_win32.c                     \
-       win32/print_win32.h                     \
+       cmake/modules/FindPORTAUDIO.cmake       \
+       cmake/modules/FindPYTHON.cmake          \
+       cmake/modules/FindSED.cmake             \
+       cmake/modules/FindSH.cmake              \
+       cmake/modules/FindSMI.cmake             \
+       cmake/modules/FindXMLLINT.cmake         \
+       cmake/modules/FindXSLTPROC.cmake        \
+       cmake/modules/FindYACC.cmake            \
+       cmake/modules/FindYAPP.cmake            \
+       cmake/modules/FindZLIB.cmake            \
+       cmake/modules/LICENSE.txt               \
+       cmake/modules/UseLemon.cmake            \
+       cmake/modules/UseMakeDissectorReg.cmake \
+       cmake/modules/UseMakeTapReg.cmake       \
+       cmake/modules/readme.txt                \
+       ui/win32/Makefile.nmake                 \
+       ui/win32/file_dlg_win32.c               \
+       ui/win32/file_dlg_win32.h               \
+       ui/win32/print_win32.c                  \
+       ui/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:
@@ -888,7 +891,7 @@ endif
 endif
 
 
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
+DIST_SUBDIRS = asn1 codecs doc epan ui/gtk help packaging plugins tools wiretap wsutil docbook
 
 if HAVE_PLUGINS
 SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
git mirror of the wireshark svn