Make Content-Length and Max-Forwards fields uints

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

diff --git a/Makefile.common b/Makefile.common
index a1322f1d9f00add5f8fa6b1eec79c233fba1619d..c94f0d9248953bc13446b06db37232ab072c7804 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -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
@@ -39,15 +39,16 @@ GENERATED_HEADER_FILES = \
 # C source files generated from source files.
 GENERATED_C_FILES = \
        $(BUILT_C_FILES)        \
-       tethereal-tap-register.c
+       tshark-tap-register.c
 
 # All the generated files.
 GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 
-# sources common for ethereal and tethereal
-ETHEREAL_COMMON_SRC =  \
+# 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 \
@@ -55,18 +56,20 @@ ETHEREAL_COMMON_SRC =       \
        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 =     \
+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 \
@@ -79,22 +82,23 @@ ETHEREAL_COMMON_INCLUDES =  \
        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        \
@@ -114,29 +118,28 @@ TETHEREAL_TAP_SRC =       \
        tap-wspstat.c
 
 # helpers already available on some platforms (and on others not)
-EXTRA_ethereal_SOURCES =       \
-       snprintf.c      \
+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_loop.c  \
        capture_opts.c \
        capture_sync.c  \
        color_filters.c \
@@ -146,10 +149,13 @@ ethereal_SOURCES =        \
        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  \
@@ -170,16 +176,19 @@ ethereal_INCLUDES =       \
        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)    \
+# tshark specifics
+tshark_SOURCES =       \
+       $(WIRESHARK_COMMON_SRC) \
+       $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
-       tethereal-tap-register.c        \
-       tethereal.c
+       capture_loop.c          \
+       tempfile.c              \
+       tshark-tap-register.c   \
+       tshark.c
 
 # text2pcap specifics
 text2pcap_SOURCES = \
@@ -194,7 +203,8 @@ mergecap_SOURCES = \
 
 # editcap specifics
 editcap_SOURCES = \
-       editcap.c
+       editcap.c       \
+       epan/crypt-md5.c
 
 # dftest specifics
 dftest_SOURCES =       \
@@ -208,22 +218,22 @@ randpkt_SOURCES = \
 # 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    \
-       pcap-util.c     \
+       dumpcap.c       \
+       pcapio.c        \
        ringbuffer.c    \
-       util.c  \
-       version_info.c \
-       capture_opts.c \
-       capture_loop.c  \
-       capture_info.c  \
-       dumpcap.c
+       sync_pipe_write.c       \
+       tempfile.c      \
+       version_info.c
 
 
 # this target needed for distribution only
 noinst_HEADERS =       \
-       $(ETHEREAL_COMMON_INCLUDES) \
-       $(ethereal_INCLUDES) \
-       $(EXTRA_ethereal_INCLUDES)
-
+       $(WIRESHARK_COMMON_INCLUDES) \
+       $(wireshark_INCLUDES) \
+       $(EXTRA_wireshark_INCLUDES)