git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix indentation.
[metze/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index d2b6204677e2c0eb36d2fc6ab51411e2e4a36b4a..140f95bfb2b8f63943ae77d67a504bcec08a1d0a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,14 +19,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include ./Makefile.am.inc
+
 AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
 # Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS
 # in configure.ac in sync, otherwise there will be an error running autogen.sh.
 ACLOCAL_AMFLAGS = `./aclocal-flags`
 
-if HAVE_WARNINGS_AS_ERRORS
-AM_CLEAN_CFLAGS = -Werror
-endif
+# Common headers
+AM_CPPFLAGS += $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
+       $(LUA_CFLAGS) $(KRB5_CFLAGS)
 
 bin_PROGRAMS = \
        @wireshark_bin@         \
@@ -42,14 +44,11 @@ bin_PROGRAMS = \
        @dumpcap_bin@           \
        @reordercap_bin@        \
        @rawshark_bin@          \
-       @androiddump_bin@       \
-       @sshdump_bin@           \
-       @randpktdump_bin@       \
        @echld_test_bin@
 
-EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype editcap \
-       mergecap dftest randpkt text2pcap dumpcap reordercap rawshark androiddump \
-       sshdump randpktdump echld_test
+EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
+       editcap mergecap dftest randpkt text2pcap dumpcap reordercap \
+       rawshark echld_test
 
 #
 # Wireshark configuration files are put in $(pkgdatadir).
@@ -421,13 +420,11 @@ wireshark_common_ldadd = \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@                \
-       @SBC_LIBS@                      \
        @GLIB_LIBS@
 
 if HAVE_Qt
 wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark-qt.cpp
 wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
-wireshark_CFLAGS = $(AM_CLEAN_CFLAGS)
 wireshark_LDADD = \
        ui/qt/libqtui.a \
        $(wireshark_common_ldadd) \
@@ -437,7 +434,6 @@ endif
 if HAVE_GTK
 wireshark_gtk_SOURCES = $(WIRESHARK_COMMON_SRC)
 wireshark_gtk_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
-wireshark_gtk_CFLAGS = $(AM_CLEAN_CFLAGS)
 wireshark_gtk_LDADD = \
        ui/gtk/libgtkui.a \
        $(wireshark_common_ldadd) \
@@ -475,8 +471,6 @@ tshark_LDADD = \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 
-tshark_CFLAGS = $(AM_CLEAN_CFLAGS)
-
 if ENABLE_STATIC
 tfshark_LDFLAGS = -Wl,-static -all-static
 else
@@ -502,8 +496,6 @@ tfshark_LDADD = \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 
-tfshark_CFLAGS = $(AM_CLEAN_CFLAGS)
-
 if ENABLE_STATIC
 rawshark_LDFLAGS = -Wl,-static -all-static
 else
@@ -532,54 +524,6 @@ rawshark_LDADD = \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 
-rawshark_CFLAGS = $(AM_CLEAN_CFLAGS)
-
-if ENABLE_STATIC
-androiddump_LDFLAGS = -Wl,-static -all-static
-else
-androiddump_LDFLAGS = -export-dynamic
-endif
-
-# Libraries and plugin flags with which to link androiddump.
-androiddump_LDADD = \
-       wiretap/libwiretap.la           \
-       wsutil/libwsutil.la             \
-       @GLIB_LIBS@                     \
-       @SOCKET_LIBS@
-
-androiddump_CFLAGS = $(AM_CLEAN_CFLAGS)
-
-if ENABLE_STATIC
-       sshdump_LDFLAGS = -Wl,-static -all-static
-else
-       sshdump_LDFLAGS = -export-dynamic
-endif
-
-# Libraries and plugin flags with which to link sshdump.
-sshdump_LDADD = \
-       wiretap/libwiretap.la           \
-       wsutil/libwsutil.la             \
-       @GLIB_LIBS@                     \
-       @LIBSSH_LIBS@           \
-       @SOCKET_LIBS@
-
-sshdump_CFLAGS = $(AM_CLEAN_CFLAGS)
-
-if ENABLE_STATIC
-       randpktdump_LDFLAGS = -Wl,-static -all-static
-else
-       randpktdump_LDFLAGS = -export-dynamic
-endif
-
-# Libraries and plugin flags with which to link randpktdump.
-randpktdump_LDADD = \
-       wiretap/libwiretap.la           \
-       wsutil/libwsutil.la             \
-       @GLIB_LIBS@                     \
-       @SOCKET_LIBS@
-
-randpktdump_CFLAGS = $(AM_CLEAN_CFLAGS)
-
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
        wsutil/libwsutil.la             \
@@ -589,14 +533,13 @@ text2pcap_LDADD = \
 # which is generated (and therefore not always clean).
 # We could generate text2pcap.o as a library with -Werror but for now it
 # doesn't seem worth the effort.
-#text2pcap_CFLAGS = $(AM_CLEAN_CFLAGS)
+text2pcap_CFLAGS = $(GENERATED_CFLAGS)
 
 # Libraries with which to link mergecap.
 mergecap_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
-mergecap_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link capinfos.
 capinfos_LDADD = \
@@ -604,31 +547,28 @@ capinfos_LDADD = \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@                     \
        @LIBGCRYPT_LIBS@
-capinfos_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link captype.
 captype_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
-captype_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link editcap.
 editcap_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
-editcap_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link reordercap.
 reordercap_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
-reordercap_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link randpkt.
 randpkt_LDADD = \
+       randpkt_core/librandpkt_core.a  \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@                     \
@@ -638,8 +578,6 @@ randpkt_LDADD = \
        @C_ARES_LIBS@                   \
        @ADNS_LIBS@
 
-randpkt_CFLAGS = $(AM_CLEAN_CFLAGS)
-
 # Libraries and plugin flags with which to link dftest.
 dftest_LDADD = \
        ui/libui.a                      \
@@ -659,8 +597,6 @@ dftest_LDADD = \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 
-dftest_CFLAGS = $(AM_CLEAN_CFLAGS)
-
 echld_test_LDADD = \
        epan/libwireshark.la            \
        echld/libechld.la               \
@@ -676,9 +612,6 @@ echld_test_DEPENDENCIES = \
        echld/libechld.la \
        epan/libwireshark.la
 
-echld_test_CFLAGS = $(AM_CLEAN_CFLAGS)
-
-
 # Libraries with which to link dumpcap.
 dumpcap_LDADD = \
        caputils/libcaputils.a          \
@@ -690,25 +623,15 @@ dumpcap_LDADD = \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
        @COREFOUNDATION_FRAMEWORKS@     \
        @LIBCAP_LIBS@
-dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(PIE_CFLAGS)
+dumpcap_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS)
 dumpcap_LDFLAGS = $(PIE_LDFLAGS)
 
-# Common headers
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
-       $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
-       @LUA_CFLAGS@ $(SBC_CFLAGS) -DTOP_SRCDIR=\"$(abs_top_srcdir)\"
-
 #
 # Build the version string
 #
 # FORCE is the portable version of .PHONY
 FORCE:
 
-AM_V_PERL = $(am__v_PERL_@AM_V@)
-am__v_PERL_ = $(am__v_PERL_@AM_DEFAULT_V@)
-am__v_PERL_0 = @echo "  PERL    " $@;
-am__v_PERL_1 =
-
 version.h: FORCE
        $(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir)
 
@@ -985,6 +908,24 @@ EXTRA_DIST = \
        image/toolbar/14x14/x-capture-comment-update.png        \
        image/toolbar/14x14/x-capture-comment-update.svg        \
        image/toolbar/14x14/x-capture-comment-update@2x.png     \
+       image/toolbar/14x14/x-capture-filter-bookmark.active.png \
+       image/toolbar/14x14/x-capture-filter-bookmark.active.svg \
+       image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png \
+       image/toolbar/14x14/x-capture-filter-bookmark.png \
+       image/toolbar/14x14/x-capture-filter-bookmark.selected.png \
+       image/toolbar/14x14/x-capture-filter-bookmark.selected.svg \
+       image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png \
+       image/toolbar/14x14/x-capture-filter-bookmark.svg \
+       image/toolbar/14x14/x-capture-filter-bookmark@2x.png \
+       image/toolbar/14x14/x-display-filter-bookmark.active.png \
+       image/toolbar/14x14/x-display-filter-bookmark.active.svg \
+       image/toolbar/14x14/x-display-filter-bookmark.active@2x.png \
+       image/toolbar/14x14/x-display-filter-bookmark.png \
+       image/toolbar/14x14/x-display-filter-bookmark.selected.png \
+       image/toolbar/14x14/x-display-filter-bookmark.selected.svg \
+       image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png \
+       image/toolbar/14x14/x-display-filter-bookmark.svg \
+       image/toolbar/14x14/x-display-filter-bookmark@2x.png \
        image/toolbar/14x14/x-expert-chat.png   \
        image/toolbar/14x14/x-expert-chat@2x.png        \
        image/toolbar/14x14/x-expert-error.png  \
@@ -996,15 +937,6 @@ EXTRA_DIST = \
        image/toolbar/14x14/x-expert-note@2x.png        \
        image/toolbar/14x14/x-expert-warn.png   \
        image/toolbar/14x14/x-expert-warn@2x.png        \
-       image/toolbar/14x14/x-filter-bookmark.active.png \
-       image/toolbar/14x14/x-filter-bookmark.active.svg \
-       image/toolbar/14x14/x-filter-bookmark.active@2x.png \
-       image/toolbar/14x14/x-filter-bookmark.png \
-       image/toolbar/14x14/x-filter-bookmark.selected.png \
-       image/toolbar/14x14/x-filter-bookmark.selected.svg \
-       image/toolbar/14x14/x-filter-bookmark.selected@2x.png \
-       image/toolbar/14x14/x-filter-bookmark.svg \
-       image/toolbar/14x14/x-filter-bookmark@2x.png \
        image/toolbar/14x14/x-filter-clear.active.png \
        image/toolbar/14x14/x-filter-clear.active.svg \
        image/toolbar/14x14/x-filter-clear.active@2x.png \
@@ -1432,9 +1364,11 @@ DIST_SUBDIRS = \
        help            \
        packaging       \
        plugins         \
+       randpkt_core    \
        tools           \
        wiretap         \
        wsutil          \
+       extcap          \
        docbook
 
 SUBDIRS = \
@@ -1451,6 +1385,8 @@ SUBDIRS = \
        ui                      \
        @wireshark_SUBDIRS@     \
        ui/cli                  \
+       randpkt_core            \
+       extcap                  \
        .                       \
        doc
 
@@ -1663,7 +1599,10 @@ osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
                cd $(srcdir)/packaging/macosx ; \
                ./osx-app.sh @OSX_APP_FLAGS@ \
                        --create-bundle \
-                       --binary-path ../staging/$(PACKAGE).inst$(bindir) ; \
+                       --binary-path ../staging/$(PACKAGE).inst$(bindir) \
+                       --plugin-path ../staging/$(PACKAGE).inst$(plugindir) \
+                       --extcap-path ../staging/$(PACKAGE).inst$(extcapdir) \
+                       --library-path ../staging/$(PACKAGE).inst$(libdir) ; \
        else \
                echo "Error: OS X packaging tools not found." ; \
                echo "Package build abandoned." ; \
@@ -1719,6 +1658,7 @@ checkapi: checkapi_local
        cd epan/dissectors && $(MAKE) checkapi
        cd epan/dissectors/dcerpc && $(MAKE) checkapi
        cd plugins && $(MAKE) checkapi
+       cd randpkt_core && $(MAKE) checkapi
        cd wsutil && $(MAKE) checkapi
 
 wsar_html: doxygen.cfg doxygen_global.cfg FORCE
@@ -1727,6 +1667,7 @@ if HAVE_DOXYGEN
        cd epan && $(MAKE) $@
        cd capchild && $(MAKE) $@
        cd caputils && $(MAKE) $@
+       cd randpkt_core && $(MAKE) $@
        cd ui && $(MAKE) $@
        (umask 022 ; $(DOXYGEN) doxygen.cfg)
 endif
Unnamed repository; edit this file to name it for gitweb.