Updates to reflect revision 4 of ethereal-win32-libs.

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

diff --git a/Makefile.common b/Makefile.common
index a3213da2dd05d7980166a04180ee42efcddb8fe7..13d78709a6e49180cc255821ec15d674a43da3ab 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -23,55 +23,34 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
-
-# corresponding headers
+# Header files for dissector helpers
+# XXX - these should be moved to epan/dissectors
 DISSECTOR_SUPPORT_INCLUDES =   \
-       adler32.h       \
-       afn.h   \
        aftypes.h       \
        arcnet_pids.h   \
        asn1.h  \
        bridged_pids.h  \
        chdlctypes.h    \
-       column.h        \
-       crc16.h \
-       crc32.h \
-       crypt-des.h     \
-       crypt-md4.h     \
-       crypt-md5.h     \
-       crypt-rc4.h     \
        etypes.h        \
        follow.h        \
        format-oid.h    \
        greproto.h      \
        h225-persistentdata.h   \
        iax2_codec_type.h       \
-       in_cksum.h      \
        ip_opts.h       \
-       ipproto.h       \
        isprint.h       \
        lapd_sapi.h     \
        llcsaps.h       \
        nlpid.h \
        oui.h   \
        ppptypes.h      \
-       prefs-int.h     \
-       prefs.h \
-       print.h \
-       ps.h    \
        ptvcursor.h     \
        reassemble.h    \
-       req_resp_hdrs.h \
        rpc_defrag.h    \
        rtp_pt.h        \
        sctpppids.h     \
        smb.h   \
-       t35.h   \
-       tap.h   \
-       util.h  \
        x264_prt_id.h   \
-       xdlc.h  \
        xmlstub.h
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
@@ -84,30 +63,38 @@ ETHEREAL_COMMON_SRC =       \
        $(PLATFORM_SRC) \
        capture_stop_conditions.c       \
        cfile.c \
+       clopts_common.c \
        conditions.c    \
        disabled_protos.c       \
+       packet-range.c  \
        pcap-util.c     \
-       range.c \
+       print.c \
+       ps.c    \
        ringbuffer.c    \
        timestats.c     \
+       util.c  \
        version_info.c
 
 # corresponding headers
 ETHEREAL_COMMON_INCLUDES =     \
        $(DISSECTOR_SUPPORT_INCLUDES)   \
-       $(BUILT_SOURCES)                \
+       svnversion.h            \
        capture_stop_conditions.h       \
        cfile.h \
+       clopts_common.h \
        color.h \
        conditions.h    \
        disabled_protos.h       \
        file.h  \
+       packet-range.h  \
        pcap-util.h     \
        pcap-util-int.h \
-       range.h \
+       print.h \
+       ps.h    \
        register.h      \
        ringbuffer.h    \
        timestats.h     \
+       util.h  \
        version_info.h
 
 # sources for Tethereal taps
@@ -153,6 +140,8 @@ ethereal_SOURCES =  \
        $(ETHEREAL_COMMON_SRC)  \
        alert_box.c     \
        capture.c       \
+       capture_combo_utils.c   \
+       color_filters.c \
        file.c  \
        filters.c       \
        g711.c \
@@ -164,6 +153,8 @@ ethereal_SOURCES =  \
 ethereal_INCLUDES =    \
        alert_box.h     \
        capture.h       \
+       capture_combo_utils.h   \
+       color_filters.h \
        filters.h       \
        g711.h  \
        globals.h       \
@@ -201,7 +192,8 @@ editcap_SOURCES = \
 
 # dftest specifics
 dftest_SOURCES =       \
-       dftest.c
+       dftest.c        \
+       util.c
 
 # randpkt specifics
 randpkt_SOURCES = \