Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.

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

diff --git a/Makefile.common b/Makefile.common
index 12661f8b9f49d3c6a558455deadc3d048fee6c79..58b4cb1b3cae3651bf4b0e4ee1e3064954cd204a 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -49,19 +49,17 @@ WIRESHARK_COMMON_SRC =      \
        $(PLATFORM_SRC) \
        capture_errs.c  \
        capture-pcap-util.c     \
-       capture_stop_conditions.c       \
        capture_ui_utils.c      \
        cfile.c \
        clopts_common.c \
-       conditions.c    \
        disabled_protos.c       \
        packet-range.c  \
        print.c \
        ps.c    \
-       pcapio.c        \
-       ringbuffer.c    \
+       sync_pipe_write.c       \
        timestats.c     \
        util.c  \
+       tap-rtp-common.c        \
        version_info.c
 
 # corresponding headers
@@ -70,26 +68,23 @@ WIRESHARK_COMMON_INCLUDES = \
        capture_errs.h  \
        capture-pcap-util.h     \
        capture-pcap-util-int.h \
-       capture_stop_conditions.h       \
        capture_ui_utils.h      \
        cfile.h \
        clopts_common.h \
        cmdarg_err.h    \
        color.h \
-       conditions.h    \
        disabled_protos.h       \
        file.h  \
        fileset.h       \
        isprint.h       \
        packet-range.h  \
-       pcapio.h        \
        print.h \
        ps.h    \
        register.h      \
-       ringbuffer.h    \
        tempfile.h      \
        timestats.h     \
        util.h  \
+       tap-rtp-common.h        \
        version_info.h
 
 # sources for TShark taps
@@ -97,6 +92,8 @@ TSHARK_TAP_SRC =      \
        tap-afpstat.c   \
        tap-ansi_astat.c        \
        tap-bootpstat.c \
+       tap-camelcounter.c      \
+       tap-camelsrt.c  \
        tap-dcerpcstat.c        \
        tap-funnel.c \
        tap-gsm_astat.c \
@@ -108,8 +105,10 @@ TSHARK_TAP_SRC =   \
        tap-mgcpstat.c  \
        tap-protocolinfo.c      \
        tap-protohierstat.c     \
+       tap-radiusstat.c        \
        tap-rpcstat.c   \
        tap-rpcprogs.c  \
+       tap-rtp.c       \
        tap-sctpchunkstat.c     \
        tap-sipstat.c \
        tap-smbsids.c   \
@@ -120,6 +119,8 @@ TSHARK_TAP_SRC =    \
 # helpers already available on some platforms (and on others not)
 EXTRA_wireshark_SOURCES =      \
        getopt.c        \
+       inet_ntop.c     \
+       inet_pton.c     \
        mkstemp.c       \
        strerror.c      \
        strcasecmp.c    \
@@ -129,6 +130,7 @@ EXTRA_wireshark_SOURCES =   \
 # corresponding headers
 EXTRA_wireshark_INCLUDES =     \
        getopt.h        \
+       inet_v6defs.h   \
        mkstemp.h       \
        strerror.h      \
        strptime.h
@@ -136,6 +138,7 @@ EXTRA_wireshark_INCLUDES =  \
 # wireshark specifics
 wireshark_SOURCES =    \
        $(WIRESHARK_COMMON_SRC) \
+       airpcap_loader.c \
        alert_box.c     \
        capture.c       \
        capture_info.c  \
@@ -148,16 +151,16 @@ wireshark_SOURCES =       \
        g711.c \
        merge.c \
        proto_hier_stats.c      \
-       sync_pipe_write.c       \
        summary.c       \
        tempfile.c
 
 # corresponding headers
 wireshark_INCLUDES =   \
+       airpcap.h       \
+       airpcap_loader.h \
        alert_box.h     \
        capture.h       \
        capture_info.h  \
-       capture_loop.h  \
        capture_opts.h  \
        capture_sync.h  \
        color_filters.h \
@@ -165,17 +168,13 @@ wireshark_INCLUDES =      \
        g711.h  \
        globals.h       \
        log.h   \
-       main_window.h   \
-       menu.h  \
        merge.h \
        progress_dlg.h  \
        proto_hier_stats.h      \
        simple_dialog.h \
        stat_menu.h     \
-       statusbar.h     \
        summary.h       \
        sync_pipe.h     \
-       tap_dfilter_dlg.h       \
        ui_util.h
 
 # tshark specifics
@@ -183,11 +182,16 @@ tshark_SOURCES =  \
        $(WIRESHARK_COMMON_SRC) \
        $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
-       capture_loop.c          \
+       capture_sync.c          \
        tempfile.c              \
        tshark-tap-register.c   \
        tshark.c
 
+# rawshark specifics
+rawshark_SOURCES =     \
+       $(WIRESHARK_COMMON_SRC) \
+       rawshark.c
+
 # text2pcap specifics
 text2pcap_SOURCES = \
        text2pcap.c \
@@ -202,7 +206,13 @@ mergecap_SOURCES = \
 # editcap specifics
 editcap_SOURCES = \
        editcap.c       \
-       epan/crypt-md5.c
+       epan/crypt/crypt-md5.c \
+       epan/nstime.c \
+       $(WTAP_PLUGIN_SOURCES)
+
+capinfos_SOURCES = \
+       capinfos.c \
+       $(WTAP_PLUGIN_SOURCES)
 
 # dftest specifics
 dftest_SOURCES =       \
@@ -217,7 +227,6 @@ randpkt_SOURCES = \
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
        capture_opts.c \
-       capture_loop.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \
        clopts_common.c \
@@ -229,9 +238,16 @@ dumpcap_SOURCES =  \
        tempfile.c      \
        version_info.c
 
+# corresponding headers
+dumpcap_INCLUDES = \
+       capture_stop_conditions.h       \
+       conditions.h    \
+       pcapio.h        \
+       ringbuffer.h
 
 # this target needed for distribution only
 noinst_HEADERS =       \
        $(WIRESHARK_COMMON_INCLUDES) \
        $(wireshark_INCLUDES) \
-       $(EXTRA_wireshark_INCLUDES)
+       $(EXTRA_wireshark_INCLUDES) \
+       $(dumpcap_INCLUDES)