Make Content-Length and Max-Forwards fields uints
[obnox/wireshark/wip.git] / Makefile.common
index 09044da7ac1518e4519b3b98edd8faf4a181f4a9..c94f0d9248953bc13446b06db37232ab072c7804 100644 (file)
@@ -5,8 +5,8 @@
 #
 # $Id$
 #
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
 # This program is free software; you can redistribute it and/or
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-# Header files for dissector helpers
-# XXX - these should be moved to epan/dissectors
-DISSECTOR_SUPPORT_INCLUDES =   \
-       aftypes.h       \
-       arcnet_pids.h   \
-       asn1.h  \
-       bridged_pids.h  \
-       chdlctypes.h    \
-       etypes.h        \
-       follow.h        \
-       format-oid.h    \
-       greproto.h      \
-       h225-persistentdata.h   \
-       iax2_codec_type.h       \
-       ip_opts.h       \
-       isprint.h       \
-       lapd_sapi.h     \
-       llcsaps.h       \
-       nlpid.h \
-       oui.h   \
-       ppptypes.h      \
-       ptvcursor.h     \
-       reassemble.h    \
-       rpc_defrag.h    \
-       rtp_pt.h        \
-       sctpppids.h     \
-       smb.h   \
-       x264_prt_id.h   \
-       xmlstub.h
-
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
-BUILT_SOURCES =                \
-       svnversion.h \
+BUILT_HEADER_FILES =   \
+       svnversion.h
+
+BUILT_C_FILES =                \
        ps.c
 
-# sources common for ethereal and tethereal
-ETHEREAL_COMMON_SRC =  \
+BUILT_SOURCES =        $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
+
+# Header files generated from source files.
+GENERATED_HEADER_FILES = \
+       $(BUILT_HEADER_FILES)
+
+# C source files generated from source files.
+GENERATED_C_FILES = \
+       $(BUILT_C_FILES)        \
+       tshark-tap-register.c
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
+
+# sources common for wireshark and tshark
+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  \
-       pcap-util.c     \
        print.c \
        ps.c    \
+       pcapio.c        \
        ringbuffer.c    \
        timestats.c     \
        util.c  \
        version_info.c
 
 # corresponding headers
-ETHEREAL_COMMON_INCLUDES =     \
-       $(DISSECTOR_SUPPORT_INCLUDES)   \
+WIRESHARK_COMMON_INCLUDES =    \
        svnversion.h            \
+       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  \
-       pcap-util.h     \
-       pcap-util-int.h \
+       pcapio.h        \
        print.h \
        ps.h    \
        register.h      \
        ringbuffer.h    \
+       tempfile.h      \
        timestats.h     \
        util.h  \
        version_info.h
 
-# sources for Tethereal taps
-TETHEREAL_TAP_SRC =    \
+# sources for TShark taps
+TSHARK_TAP_SRC =       \
+       tap-afpstat.c   \
        tap-ansi_astat.c        \
        tap-bootpstat.c \
        tap-dcerpcstat.c        \
+       tap-funnel.c \
        tap-gsm_astat.c \
        tap-h225counter.c       \
        tap-h225rassrt.c        \
@@ -113,69 +110,85 @@ TETHEREAL_TAP_SRC =       \
        tap-protohierstat.c     \
        tap-rpcstat.c   \
        tap-rpcprogs.c  \
+       tap-sctpchunkstat.c     \
        tap-sipstat.c \
        tap-smbsids.c   \
        tap-smbstat.c   \
+       tap-stats_tree.c        \
        tap-wspstat.c
 
-# helpers alraedy available on some platforms (and on others not)
-EXTRA_ethereal_SOURCES =       \
-       snprintf.c      \
+# helpers already available on some platforms (and on others not)
+EXTRA_wireshark_SOURCES =      \
+       getopt.c        \
+       mkstemp.c       \
        strerror.c      \
        strcasecmp.c    \
        strncasecmp.c   \
-       mkstemp.c       \
        strptime.c
 
 # corresponding headers
-EXTRA_ethereal_INCLUDES =      \
-       snprintf.h      \
-       snprintf-imp.h  \
-       strerror.h      \
+EXTRA_wireshark_INCLUDES =     \
+       getopt.h        \
        mkstemp.h       \
+       strerror.h      \
        strptime.h
 
-# ethereal specifics
-ethereal_SOURCES =     \
-       $(ETHEREAL_COMMON_SRC)  \
+# wireshark specifics
+wireshark_SOURCES =    \
+       $(WIRESHARK_COMMON_SRC) \
+       airpcap_loader.c \
        alert_box.c     \
        capture.c       \
+       capture_info.c  \
+       capture_opts.c \
        capture_sync.c  \
-       capture_combo_utils.c   \
        color_filters.c \
        file.c  \
+       fileset.c       \
        filters.c       \
        g711.c \
        merge.c \
        proto_hier_stats.c      \
-       summary.c
+       sync_pipe_write.c       \
+       summary.c       \
+       tempfile.c
 
 # corresponding headers
-ethereal_INCLUDES =    \
+wireshark_INCLUDES =   \
+       airpcap_loader.h \
        alert_box.h     \
        capture.h       \
+       capture_info.h  \
+       capture_loop.h  \
+       capture_opts.h  \
        capture_sync.h  \
-       capture_combo_utils.h   \
        color_filters.h \
        filters.h       \
        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
 
-# tethereal specifics
-tethereal_SOURCES =    \
-       $(ETHEREAL_COMMON_SRC)  \
-       $(TETHEREAL_TAP_SRC)    \
-       tethereal-tap-register.c        \
-       tethereal.c
+# tshark specifics
+tshark_SOURCES =       \
+       $(WIRESHARK_COMMON_SRC) \
+       $(TSHARK_TAP_SRC)       \
+       capture_opts.c          \
+       capture_loop.c          \
+       tempfile.c              \
+       tshark-tap-register.c   \
+       tshark.c
 
 # text2pcap specifics
 text2pcap_SOURCES = \
@@ -190,7 +203,8 @@ mergecap_SOURCES = \
 
 # editcap specifics
 editcap_SOURCES = \
-       editcap.c
+       editcap.c       \
+       epan/crypt-md5.c
 
 # dftest specifics
 dftest_SOURCES =       \
@@ -201,10 +215,25 @@ dftest_SOURCES =  \
 randpkt_SOURCES = \
        randpkt.c
 
+# dumpcap specifics
+dumpcap_SOURCES =      \
+       $(PLATFORM_SRC) \
+       capture_opts.c \
+       capture_loop.c  \
+       capture-pcap-util.c     \
+       capture_stop_conditions.c       \
+       clopts_common.c \
+       conditions.c    \
+       dumpcap.c       \
+       pcapio.c        \
+       ringbuffer.c    \
+       sync_pipe_write.c       \
+       tempfile.c      \
+       version_info.c
+
+
 # this target needed for distribution only
 noinst_HEADERS =       \
-       $(DISSECTOR_SUPPORT_INCLUDES) \
-       $(ETHEREAL_COMMON_INCLUDES) \
-       $(ethereal_INCLUDES) \
-       $(EXTRA_ethereal_INCLUDES)
-
+       $(WIRESHARK_COMMON_INCLUDES) \
+       $(wireshark_INCLUDES) \
+       $(EXTRA_wireshark_INCLUDES)