Move header files for stuff used by dissectors, and source files

containing helper routines, to DISSECTOR_HELPER_SRC.  Include
DISSECTOR_HELPER_SRC in ETHEREAL_COMMON_SRC, and include BUILT_SOURCES
in ETHEREAL_COMMON_SRC rather than repeating those headers directly.  Do
similar things with ETHEREAL_COMMON_OBJECTS and DISSECTOR_COMMON_OBJECTS
in Makefile.nmake.

Add "packet-x11-keysymdef.h" to "noinst_Headers", so it's built as part
of the tarball.

svn path=/trunk/; revision=9627

diff --git a/Makefile.am b/Makefile.am
index 61a4ceee6ed9756119516f24b3fae653bbc2ad63..d58b82298ebf9efee941e20f54b7f3f7251aafdc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.685 2004/01/10 02:43:28 guy Exp $
+# $Id: Makefile.am,v 1.686 2004/01/10 04:09:14 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -770,12 +770,13 @@ noinst_HEADERS = \
        packet-wtls.h \
        packet-wtp.h \
        packet-x11-keysym.h     \
+       packet-x11-keysymdef.h  \
        packet-ypbind.h \
        packet-yppasswd.h \
        packet-ypserv.h \
        packet-ypxfr.h
 
-ETHEREAL_COMMON_SRC = \
+DISSECTOR_HELPER_SRC = \
        adler32.c      \
        adler32.h      \
        afn.c          \
@@ -785,16 +786,7 @@ ETHEREAL_COMMON_SRC = \
        asn1.c         \
        asn1.h         \
        bridged_pids.h \
-       capture_stop_conditions.c   \
-       capture_stop_conditions.h   \
-       cfile.c         \
-       cfile.h         \
        chdlctypes.h   \
-       color.h        \
-       column.c       \
-       column.h       \
-       conditions.c   \
-       conditions.h   \
        crc32.c        \
        crc32.h        \
        crypt-des.c    \
@@ -805,12 +797,7 @@ ETHEREAL_COMMON_SRC = \
        crypt-md5.h    \
        crypt-rc4.c    \
        crypt-rc4.h    \
-       disabled_protos.c      \
-       disabled_protos.h      \
        etypes.h       \
-       file.h         \
-       follow.c       \
-       follow.h       \
        format-oid.h   \
        g711.c          \
        g711.h          \
@@ -826,11 +813,48 @@ ETHEREAL_COMMON_SRC = \
        nlpid.h        \
        oui.h          \
        packet-dcerpc-nt.c \
+       ppptypes.h     \
+       ptvcursor.c     \
+       ptvcursor.h     \
+       reassemble.c   \
+       reassemble.h   \
+       req_resp_hdrs.c \
+       req_resp_hdrs.h \
+       rpc_defrag.h   \
+       rtp_pt.h       \
+       sctpppids.h    \
+       smb.h          \
+       t35.c           \
+       t35.h           \
+       x264_prt_id.h  \
+       xdlc.c         \
+       xdlc.h
+
+BUILT_SOURCES = \
+       x11-declarations.h \
+       x11-register-info.h
+
+ETHEREAL_COMMON_SRC = \
+       $(DISSECTOR_HELPER_SRC) \
+       $(BUILT_SOURCES) \
+       capture_stop_conditions.c   \
+       capture_stop_conditions.h   \
+       cfile.c         \
+       cfile.h         \
+       color.h        \
+       column.c       \
+       column.h       \
+       conditions.c   \
+       conditions.h   \
+       disabled_protos.c      \
+       disabled_protos.h      \
+       file.h         \
+       follow.c       \
+       follow.h       \
        pcap-util.c    \
        pcap-util.h    \
        pcap-util-int.h \
        pcap-util-unix.c \
-       ppptypes.h     \
        prefs-int.h    \
        prefs.c        \
        prefs.h        \
@@ -838,23 +862,11 @@ ETHEREAL_COMMON_SRC = \
        print.h        \
        ps.c           \
        ps.h           \
-       ptvcursor.c     \
-       ptvcursor.h     \
        range.c         \
        range.h         \
-       reassemble.c   \
-       reassemble.h   \
        register.h     \
-       req_resp_hdrs.c \
-       req_resp_hdrs.h \
        ringbuffer.c   \
        ringbuffer.h   \
-       rpc_defrag.h   \
-       rtp_pt.h       \
-       sctpppids.h    \
-       smb.h          \
-       t35.c           \
-       t35.h           \
        tap.c           \
        tap.h           \
        tap_dfilter_dlg.h \
@@ -862,18 +874,9 @@ ETHEREAL_COMMON_SRC = \
        timestats.h     \
        util.c         \
        util.h         \
-       x11-declarations.h \
-       x11-register-info.h \
-       x264_prt_id.h  \
-       xdlc.c         \
-       xdlc.h         \
        xmlstub.c      \
        xmlstub.h
 
-BUILT_SOURCES = \
-       x11-declarations.h \
-       x11-register-info.h
-
 ethereal_SOURCES = \
        $(DISSECTOR_SRC) \
        $(ETHEREAL_COMMON_SRC) \

diff --git a/Makefile.nmake b/Makefile.nmake
index ebefdb217129f9c7bc2c20c3670ea182c09be858..fbd07677d7bd7bd9bb4a442215394c1b0e90f331 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.384 2004/01/10 02:38:39 obiot Exp $
+# $Id: Makefile.nmake,v 1.385 2004/01/10 04:09:14 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -446,44 +446,47 @@ TETHEREAL_TAP_SRC = \
 
 TETHEREAL_TAP_OBJECTS = $(TETHEREAL_TAP_SRC:.c=.obj)
 
-ETHEREAL_COMMON_OBJECTS = \
+DISSECTOR_HELPER_OBJECTS = \
        adler32.obj      \
        afn.obj          \
        asn1.obj         \
-       capture_stop_conditions.obj \
-       capture-wpcap.obj \
-       cfile.obj       \
-       column.obj       \
-       conditions.obj   \
        crc32.obj        \
        crypt-des.obj    \
        crypt-md4.obj    \
        crypt-md5.obj    \
        crypt-rc4.obj    \
-       disabled_protos.obj     \
-       follow.obj       \
        g711.obj        \
-       getopt.obj       \
        h225-persistentdata.obj \
        in_cksum.obj     \
        ipproto.obj      \
        packet-dcerpc-nt.obj \
+       ptvcursor.obj    \
+       reassemble.obj   \
+       req_resp_hdrs.obj \
+       t35.obj         \
+       xdlc.obj
+
+ETHEREAL_COMMON_OBJECTS = \
+       $(DISSECTOR_HELPER_OBJECTS) \
+       capture_stop_conditions.obj \
+       capture-wpcap.obj \
+       cfile.obj       \
+       column.obj       \
+       conditions.obj   \
+       disabled_protos.obj     \
+       follow.obj       \
+       getopt.obj       \
        pcap-util.obj    \
        prefs.obj        \
        print.obj        \
        ps.obj           \
-       ptvcursor.obj    \
        range.obj        \
-       reassemble.obj   \
        register.obj     \
-       req_resp_hdrs.obj \
        ringbuffer.obj   \
-       t35.obj         \
        tap.obj         \
        timestats.obj   \
        util.obj         \
-       xdlc.obj         \
-       xmlstub.obj      \
+       xmlstub.obj
 
 ethereal_OBJECTS = \
        $(DISSECTOR_OBJECTS) \