Remove DISSECTOR_ASSERT since private_data isn't being used anymore to transport...

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

diff --git a/Makefile.am b/Makefile.am
index f594530a65fa4d413438ad45f716fc033567365b..11443feecec6f4ea5c0a21d7b6e061152ca6a1db 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
 ACLOCAL_AMFLAGS = `./aclocal-flags`
 
 if HAVE_LIBPY
@@ -55,14 +56,14 @@ EXTRA_PROGRAMS = wireshark wireshark-qt tshark capinfos editcap mergecap \
 #
 # Wireshark configuration files are put in $(pkgdatadir).
 #
-pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
+dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
        smi_modules ipmap.html pdml2html.xsl
 
 #
 # Install global profiles in the "profiles" subdirectory
 #
 profilesdir = $(pkgdatadir)
-nobase_profiles_DATA = \
+nobase_dist_profiles_DATA = \
        profiles/Bluetooth/colorfilters \
        profiles/Classic/colorfilters
 
@@ -71,10 +72,12 @@ nobase_profiles_DATA = \
 # of that directory.
 #
 diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = \
+include diameter/Custom.make
+dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
        diameter/chargecontrol.xml \
        diameter/ChinaTelecom.xml \
        diameter/Cisco.xml \
+       diameter/Custom.xml \
        diameter/dictionary.dtd \
        diameter/dictionary.xml \
        diameter/eap.xml \
@@ -90,19 +93,20 @@ diameter_DATA = \
        diameter/TGPPGmb.xml \
        diameter/TGPPRx.xml \
        diameter/TGPPS9.xml \
-       diameter/TGPPSh.xml     \
+       diameter/TGPPSh.xml \
        diameter/Vodafone.xml \
        diameter/AlcatelLucent.xml \
        diameter/Nokia.xml \
        diameter/NokiaSiemensNetworks.xml \
-       diameter/SKT.xml
+       diameter/SKT.xml \
+       diameter/VerizonWireless.xml
 
 #
 # Install the DTDs directory files in the "dtds" subdirectory
 # of that directory
 #
 dtdsdir = $(pkgdatadir)/dtds
-dtds_DATA = \
+dist_dtds_DATA = \
        dtds/dc.dtd \
        dtds/itunes.dtd \
        dtds/mscml.dtd \
@@ -121,8 +125,8 @@ dtds_DATA = \
 # of that directory.
 #
 radiusdir = $(pkgdatadir)/radius
--include radius/Custom.make
-radius_DATA = $(_CUSTOM_radius_dict_) \
+include radius/Custom.make
+dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/README.radius_dictionary  \
        radius/custom.includes  \
        radius/dictionary  \
@@ -274,7 +278,7 @@ radius_DATA = $(_CUSTOM_radius_dict_) \
 # of that directory
 #
 tpncpdir = $(pkgdatadir)/tpncp
-tpncp_DATA = \
+dist_tpncp_DATA = \
        tpncp/tpncp.dat
 
 #
@@ -282,7 +286,7 @@ tpncp_DATA = \
 # of that directory
 #
 wimaxasncpdir = $(pkgdatadir)/wimaxasncp
-wimaxasncp_DATA = \
+dist_wimaxasncp_DATA = \
        wimaxasncp/dictionary.xml \
        wimaxasncp/dictionary.dtd
 
@@ -308,7 +312,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
 
 WTAP_PLUGIN_SOURCES = \
        epan/plugins.c \
-       epan/report_err.c \
        epan/filesystem.c
 
 else           # HAVE_PLUGINS
@@ -387,6 +390,12 @@ wireshark_qt_SOURCES = $(WIRESHARK_COMMON_SRC)
 wireshark_qt_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
 wireshark_qt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 wireshark_qt_LDADD =  ui/qt/libqtui.a $(wireshark_ldadd) @Qt_LIBS@
+#
+# XXX - this makes wireshark_qt_LDFLAGS not work; we should figure out
+# another way to get wireshark-qt linked as a C++ program, perhaps by
+# having a top-level wireshark-qt.cpp file that contains main() and
+# hthat calls the UI code from ui/qt.
+#
 wireshark_qt_LINK = $(CXXLINK)
 endif
 
@@ -395,7 +404,6 @@ wireshark_SOURCES = $(WIRESHARK_COMMON_SRC)
 wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
 wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 wireshark_LDADD = ui/gtk/libgtkui.a $(wireshark_ldadd) @GTK_LIBS@
-wireshark_LINK = $(LINK)
 endif
 
 # Ideally we could trigger automatic c++ linking here with
@@ -571,7 +579,7 @@ dumpcap_LDFLAGS = $(PIE_LDFLAGS)
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
        $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS) \
-       @LUA_INCLUDES@
+       @LUA_INCLUDES@ -DTOP_SRCDIR=\"$(abs_top_srcdir)\"
 
 #
 # Build the version string
@@ -598,11 +606,8 @@ SUFFIXES = .sh
        rm -f $@ $@.tmp
        $(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
 
-ps.c: print.ps $(srcdir)/tools/rdps.py
-       $(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
-
 services:
-       $(PERL) $(srcdir)/tools/make-services.pl
+       $(PYTHON) $(srcdir)/tools/make-services.py
 
 CLEANFILES =           \
        *~              \
@@ -658,7 +663,6 @@ EXTRA_DIST = \
        aclocal-fallback/glib-2.0.m4 \
        aclocal-fallback/gtk-2.0.m4 \
        aclocal-fallback/gtk-3.0.m4 \
-       aclocal-fallback/qt.m4 \
        aclocal-flags           \
        adns_dll.dep            \
        adns_dll.rc             \
@@ -681,7 +685,6 @@ EXTRA_DIST = \
        debian/dirs             \
        debian/headers-check.c  \
        debian/patches/00list   \
-       debian/patches/03_preferences.dpatch \
        debian/postinst         \
        debian/pycompat         \
        debian/pyversions       \
@@ -703,11 +706,11 @@ EXTRA_DIST = \
        debian/wireshark.files \
        debian/wireshark.manpages \
        debian/wireshark.menu   \
-       debian-setup.sh         \
        dfilters                \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
+       epan/print.ps           \
        fix/FIX.xml             \
        fix/FIX40.xml           \
        fix/FIX41.xml           \
@@ -806,10 +809,12 @@ EXTRA_DIST = \
        image/minus-8.png                       \
        image/nsis-checked.bmp                  \
        image/nsis-unchecked.bmp                \
+       image/openhand-16.png                   \
        image/plus-8.png                        \
        image/rawshark.rc.in                    \
        image/README.image                      \
        image/reordercap.rc.in                  \
+       image/rubberband-16.png                 \
        image/status.qrc                        \
        image/stock_dialog_error_48.xpm         \
        image/stock_dialog_info_48.xpm          \
@@ -926,6 +931,7 @@ EXTRA_DIST = \
        image/wssplash.png      \
        ipmap.html              \
        macosx-setup.sh         \
+        macosx-support-lib-patches/glib-gconvert.c.patch \
        macosx-support-lib-patches/glib-pkgconfig.patch \
        macosx-support-lib-patches/gnutls-pkgconfig.patch \
        macosx-support-lib-patches/portaudio-pa_mac_core.h.patch \
@@ -935,14 +941,6 @@ EXTRA_DIST = \
        manuf.tmpl              \
        mergecap.c              \
        pdml2html.xsl           \
-       print.ps                \
-       $(diameter_DATA)        \
-       $(dtds_DATA)            \
-       $(nobase_profiles_DATA) \
-       $(radius_DATA)          \
-       $(tpncp_DATA)           \
-       $(ui_DATA)              \
-       $(wimaxasncp_DATA)      \
        reordercap.c            \
        smi_modules             \
        text2pcap-scanner.l     \
@@ -1086,7 +1084,7 @@ install_desktop_files:
 
 # Used by svr4-package and osx-package
 # We load top_stagedir with an explicit path so that libtool doesn't freak.
-top_stagedir=`cd $(top_srcdir) && pwd`/packaging/staging
+top_stagedir=`cd $(top_builddir) && pwd`/packaging/staging
 stagedir=$(top_stagedir)/$(PACKAGE).inst
 
 host_cpu=@host_cpu@
@@ -1152,7 +1150,7 @@ osx-package: osx-app packaging/macosx/COPYING.txt
        @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
                cd $(srcdir)/packaging/macosx ;  \
                chmod +x ./osx-dmg.sh ; \
-               ./osx-dmg.sh ; \
+               ./osx-dmg.sh @OSX_DMG_FLAGS@ ; \
        fi
 
 osx-install: osx-app