git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix build by #if 0 out unused de_sgsap_tmsi() function.
[obnox/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 61b8e7934b1878b20c4ec5684aad321166f80eae..50477b777f770983ed18488f8955d26e394bc7a6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,7 @@ diameter_DATA = \
        diameter/gqpolicy.xml \
        diameter/imscxdx.xml \
        diameter/mobileipv4.xml \
+       diameter/mobileipv6.xml \
        diameter/nasreq.xml \
        diameter/sip.xml \
        diameter/sunping.xml \
@@ -145,6 +146,7 @@ radius_DATA = \
        radius/dictionary.cosine  \
        radius/dictionary.dhcp \
        radius/dictionary.digium \
+       radius/dictionary.eltex \
        radius/dictionary.epygi \
        radius/dictionary.ericsson  \
        radius/dictionary.erx  \
@@ -269,6 +271,7 @@ 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 \
@@ -293,17 +296,6 @@ endif              # HAVE_PLUGINS
 
 include Makefile.common
 
-# Optional objects that I know how to build. These will be
-# linked into the wireshark executable.
-# They will also be linked into the tshark executable; if this
-# list ever grows to include something that can't be linked with
-# tshark, or if tshark needs something that wireshark doesn't,
-# we should probably split this into stuff needed both
-# by wireshark and tshark and stuff needed only by one or the
-# other.
-wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \
-       @STRNCASECMP_O@ @STRPTIME_O@
-
 if ENABLE_STATIC
 wireshark_LDFLAGS = -Wl,-static -all-static
 else
@@ -318,23 +310,22 @@ endif
 # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
 # applications are X applications).
 wireshark_LDADD = \
-       $(wireshark_optional_objects)   \
        gtk/libui.a                     \
+       gtk/libui_dirty.a               \
        codecs/libcodec.a               \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @INET_PTON_LO@                  \
-       @INET_NTOP_LO@                  \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @PCAP_LIBS@                     \
-       @GTK_LIBS@                      \
+       @GTK_LIBS@ -lm                  \
        @C_ARES_LIBS@                   \
        @ADNS_LIBS@                     \
        @KRB5_LIBS@                     \
-       @FRAMEWORKS@                    \
+       @LAUNCHSERVICES_FRAMEWORKS@     \
+       @CORESERVICES_FRAMEWORKS@       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@                \
@@ -349,12 +340,9 @@ endif
 
 # Libraries and plugin flags with which to link tshark.
 tshark_LDADD = \
-       $(wireshark_optional_objects)   \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @INET_PTON_LO@                  \
-       @INET_NTOP_LO@                  \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
@@ -365,7 +353,7 @@ tshark_LDADD = \
        @C_ARES_LIBS@                   \
        @ADNS_LIBS@                     \
        @KRB5_LIBS@                     \
-       @FRAMEWORKS@                    \
+       @CORESERVICES_FRAMEWORKS@       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
@@ -377,14 +365,11 @@ else
 rawshark_LDFLAGS = -export-dynamic
 endif
 
-# Libraries and plugin flags with which to link tshark.
+# Libraries and plugin flags with which to link rawshark.
 rawshark_LDADD = \
-       $(wireshark_optional_objects)   \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @INET_PTON_LO@                  \
-       @INET_NTOP_LO@                  \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
@@ -395,19 +380,14 @@ rawshark_LDADD = \
        @C_ARES_LIBS@                   \
        @ADNS_LIBS@                     \
        @KRB5_LIBS@                     \
-       @FRAMEWORKS@                    \
+       @CORESERVICES_FRAMEWORKS@       \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 rawshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
-# Optional objects that I know how to build, and that are needed by
-# text2pcap.
-text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
-
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
-       $(text2pcap_optional_objects)   \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@ -lm
@@ -453,7 +433,6 @@ randpkt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries and plugin flags with which to link dftest.
 dftest_LDADD = \
-       $(wireshark_optional_objects)   \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        epan/libwireshark.la            \
@@ -476,14 +455,11 @@ dftest_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 dumpcap_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
-       @INET_NTOP_LO@                  \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
        @SOCKET_LIBS@                   \
        @NSL_LIBS@                      \
-       @FRAMEWORKS@                    \
-       @LIBGCRYPT_LIBS@                \
-       @LIBGNUTLS_LIBS@                \
+       @CORESERVICES_FRAMEWORKS@       \
        @LIBCAP_LIBS@
 dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
@@ -498,7 +474,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
 FORCE:
 
 svnversion.h: FORCE
-       LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir)
+       $(PERL) $(srcdir)/make-version.pl $(srcdir)
 
 #
 # Build shell scripts by doing variable substitution.
@@ -532,6 +508,9 @@ tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/tools/make-tapreg-dotc
 ps.c: print.ps $(srcdir)/tools/rdps.py
        $(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
 
+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
@@ -576,7 +555,7 @@ EXTRA_DIST = \
        README.macos            \
        README.tru64            \
        README.vmware           \
-       README.win32            \
+       README.windows          \
        aclocal-fallback/glib-2.0.m4 \
        aclocal-fallback/gtk-2.0.m4 \
        aclocal-flags           \
@@ -622,8 +601,6 @@ EXTRA_DIST = \
        debian/wireshark.manpages \
        debian/wireshark.menu   \
        dfilters                \
-       docbook/Makefile.auto.am        \
-       docbook/ws.css          \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
@@ -673,7 +650,6 @@ EXTRA_DIST = \
        image/capinfos.rc.in    \
        image/clist_ascend.xpm  \
        image/clist_descend.xpm \
-       image/dn_arrow.xpm      \
        image/dumpcap.rc.in     \
        image/editcap.rc.in     \
        image/file_dlg_win32.rc \
@@ -703,6 +679,7 @@ EXTRA_DIST = \
        image/stock_dialog_stop_48.xpm  \
        image/stock_dialog_warning_48.xpm       \
        image/text2pcap.rc.in   \
+       image/WiresharkDoc_24.xpm       \
        image/toolbar/analyze_24.xpm \
        image/toolbar/audio_player_24.xpm       \
        image/toolbar/autoscroll_24.xpm \
@@ -759,7 +736,6 @@ EXTRA_DIST = \
        image/toolbar/wep_closed_24.xpm \
        image/toolbar/wiki_24.xpm       \
        image/tshark.rc.in      \
-       image/up_arrow.xpm      \
        image/voip_bg.xpm       \
        image/voip_select.xpm   \
        image/wireshark.exe.manifest.in \
@@ -797,7 +773,6 @@ EXTRA_DIST = \
        image/wssplash-dev.xpm  \
        image/wssplash.xpm      \
        ipmap.html      \
-       make-manuf              \
        make-version.pl         \
        manuf                   \
        manuf.tmpl              \
@@ -815,16 +790,78 @@ EXTRA_DIST = \
        text2pcap.h             \
        services                \
        wireshark.desktop       \
-       wka.tmpl
+       wka.tmpl                \
+       CMakeLists.txt          \
+       cmakeconfig.h.in        \
+       wsutil/CMakeLists.txt   \
+       CMakeOptions.txt        \
+       wiretap/CMakeLists.txt  \
+       README.cmake            \
+       ConfigureChecks.cmake   \
+       cmake/modules/readme.txt                \
+       cmake/modules/FindLYNX.cmake            \
+       cmake/modules/FindYACC.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/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/FindHtmlViewer.cmake      \
+       cmake/modules/FindGTK2.cmake            \
+       cmake/modules/FindFOP.cmake             \
+       cmake/modules/LICENSE.txt               \
+       cmake/modules/CMakeInstallDirs.cmake    \
+       cmake/modules/CheckCLinkerFlag.cmake    \
+       cmake/modules/UseMakeTapReg.cmake       \
+       cmake/modules/FindM.cmake               \
+       cmake/modules/FindKERBEROS.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                     \
+       CPackConfig.txt                         \
+       all.vcproj              \
+       dumpcap.vcproj          \
+       packaging.vcproj        \
+       tshark.vcproj           \
+       wireshark.vcproj
 
-if SETUID_INSTALL
 install-exec-hook:
-       -chmod +s $(DESTDIR)$(bindir)/dumpcap
+if HAVE_DUMPCAP_GROUP
+       -chgrp $(DUMPCAP_GROUP) $(DESTDIR)$(bindir)/dumpcap
+endif
+if SETCAP_INSTALL
+       -$(SETCAP) cap_net_raw,cap_net_admin+eip $(DESTDIR)$(bindir)/dumpcap
+       -chmod o-rws $(DESTDIR)$(bindir)/dumpcap
 else
-install-exec-hook:
+if SETUID_INSTALL
+       -chmod o-rws $(DESTDIR)$(bindir)/dumpcap
+       -chmod +s $(DESTDIR)$(bindir)/dumpcap
+endif
 endif
 
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
+
+DIST_SUBDIRS = asn1 codecs doc epan 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