git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
hardcode /bin/sh to idl2wrs
[obnox/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a73c459f697d23a995fb03e37d373e1d6c84d52f..7e4c42c304c44c76e546370b102343fe5e8bac26 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
+EXTRA_SCRIPTS = tools/idl2wrs
 
 #
 # Wireshark configuration files are put in $(pkgdatadir).
@@ -70,6 +65,7 @@ pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
 diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = \
        diameter/chargecontrol.xml \
+       diameter/Cisco.xml \
        diameter/dictionary.dtd \
        diameter/dictionary.xml \
        diameter/eap.xml \
@@ -84,7 +80,8 @@ diameter_DATA = \
        diameter/sunping.xml \
        diameter/TGPPGmb.xml \
        diameter/TGPPRx.xml \
-       diameter/TGPPSh.xml
+       diameter/TGPPSh.xml     \
+       diameter/Vodafone.xml
 
 #
 # Install the DTDs directory files in the "dtds" subdirectory
@@ -261,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 = \
+       gtk/ui/main-menubar-ui.xml
 
 #
 # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
@@ -282,7 +286,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
        -dlopen plugins/giop/cosnaming.la \
        -dlopen plugins/giop/coseventcomm.la \
        -dlopen plugins/gryphon/gryphon.la \
-       -dlopen plugins/interlink/interlink.la \
        -dlopen plugins/irda/irda.la \
        -dlopen plugins/m2m/m2m.la \
        -dlopen plugins/mate/mate.la \
@@ -328,7 +331,6 @@ wireshark_LDADD = \
        wsutil/libwsutil.la             \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @PCAP_LIBS@                     \
        @GTK_LIBS@ -lm                  \
        @C_ARES_LIBS@                   \
@@ -336,6 +338,7 @@ wireshark_LDADD = \
        @KRB5_LIBS@                     \
        @LAUNCHSERVICES_FRAMEWORKS@     \
        @CORESERVICES_FRAMEWORKS@       \
+       @PY_LIBS@                       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@                \
@@ -355,7 +358,6 @@ tshark_LDADD = \
        wsutil/libwsutil.la             \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
@@ -364,6 +366,7 @@ tshark_LDADD = \
        @ADNS_LIBS@                     \
        @KRB5_LIBS@                     \
        @CORESERVICES_FRAMEWORKS@       \
+       @PY_LIBS@                       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
@@ -382,7 +385,6 @@ rawshark_LDADD = \
        wsutil/libwsutil.la             \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
@@ -391,6 +393,7 @@ rawshark_LDADD = \
        @ADNS_LIBS@                     \
        @KRB5_LIBS@                     \
        @CORESERVICES_FRAMEWORKS@       \
+       @PY_LIBS@                       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
@@ -448,7 +451,6 @@ dftest_LDADD = \
        epan/libwireshark.la            \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
@@ -456,6 +458,7 @@ dftest_LDADD = \
        @C_ARES_LIBS@                   \
        @ADNS_LIBS@                     \
        @KRB5_LIBS@                     \
+       @PY_LIBS@                       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
@@ -520,35 +523,36 @@ 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)      \
        Makefile.in             \
        aclocal.m4              \
+       compile                 \
        config.h.in             \
        configure               \
        depcomp                 \
        install-sh              \
        ltmain.sh               \
-       missing
+       missing                 \
+       ylwrap
 
 EXTRA_DIST = \
        INSTALL.configure       \
@@ -740,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  \
@@ -786,6 +794,10 @@ EXTRA_DIST = \
        image/wssplash-dev.xpm  \
        image/wssplash.xpm      \
        ipmap.html              \
+       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              \
@@ -796,6 +808,7 @@ EXTRA_DIST = \
        $(dtds_DATA)            \
        $(radius_DATA)          \
        $(tpncp_DATA)           \
+       $(ui_DATA)              \
        $(wimaxasncp_DATA)      \
        randpkt.c               \
        smi_modules             \
@@ -812,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          \
+       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                \
+       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:
git mirror of the wireshark svn