Another try: we're in epan here so getting to libwsutil and wiretap requires going...

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

diff --git a/Makefile.am b/Makefile.am
index 192dd678735126c98d3d902104dd55d3be1de773..f79f5c47d3ce5cff796b0fe7bc29d51ae90a30af 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -388,6 +388,7 @@ endif
 wireshark_LDADD = \
        ui/gtk/libgtkui.a               \
        ui/gtk/libgtkui_dirty.a         \
+       ui/libui.a                      \
        codecs/libcodec.a               \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
@@ -416,6 +417,8 @@ endif
 
 # Libraries and plugin flags with which to link tshark.
 tshark_LDADD = \
+       ui/cli/libcliui.a               \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
@@ -443,6 +446,7 @@ endif
 
 # Libraries and plugin flags with which to link rawshark.
 rawshark_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
@@ -509,6 +513,7 @@ randpkt_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries and plugin flags with which to link dftest.
 dftest_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        epan/libwireshark.la            \
@@ -562,24 +567,6 @@ SUFFIXES = .sh
        rm -f $@ $@.tmp
        $(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
 
-#
-# Build "tshark-tap-register.c", which contains a function
-# "register_all_tap_listeners()"
-# that calls the register routines for all tshark tap listeners.
-#
-# We do this by grepping through sources.
-#
-# Formatting conventions:  The name of the tap_listener_register_*
-# routines must start in column zero, or must be preceded only by
-# "void " starting in column zero, and must not be inside #if.
-#
-# The first argument is the directory in which the source files live.
-# All subsequent arguments are the files to scan.
-#
-tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/tools/make-tapreg-dotc
-       @echo Making tshark-tap-register.c
-       @$(srcdir)/tools/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
-
 ps.c: print.ps $(srcdir)/tools/rdps.py
        $(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
 
@@ -955,12 +942,12 @@ endif
 endif
 
 
-DIST_SUBDIRS = asn1 codecs doc epan ui/gtk help packaging plugins tools wiretap wsutil docbook
+DIST_SUBDIRS = asn1 codecs doc epan ui ui/cli ui/gtk help packaging plugins tools wiretap wsutil docbook
 
 if HAVE_PLUGINS
-SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
+SUBDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
 else
-SUBDIRS = tools wsutil wiretap epan packaging help @wireshark_SUBDIRS@ . doc
+SUBDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
 endif
 
 help/faq.txt: $(srcdir)/help/faq.py
@@ -1077,6 +1064,7 @@ checkapi_local:
 checkapi: checkapi_local
        cd wiretap && $(MAKE) checkapi
        cd codecs && $(MAKE) checkapi
+       cd ui && $(MAKE) checkapi
        cd ui/gtk && $(MAKE) checkapi
 ##     cd epan && $(MAKE) checkapi
 ##     cd epan/crypt && $(MAKE) checkapi