Nothing in "util.h" is needed by anything in libethereal, so don't put

it into libethereal - have it as common code linked into Ethereal,
Tethereal, and dftest.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11961 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index b212be2bf919b7247d7cf41af1480f1c9303d2c8..b693cfe77d90b04238b65b7198ade2a63c6568b5 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -67,7 +67,6 @@ DISSECTOR_SUPPORT_INCLUDES =  \
        smb.h   \
        t35.h   \
        tap.h   \
-       util.h  \
        x264_prt_id.h   \
        xdlc.h  \
        xmlstub.h
@@ -91,6 +90,7 @@ ETHEREAL_COMMON_SRC = \
        ps.c    \
        ringbuffer.c    \
        timestats.c     \
+       util.c  \
        version_info.c
 
 # corresponding headers
@@ -112,6 +112,7 @@ ETHEREAL_COMMON_INCLUDES =  \
        register.h      \
        ringbuffer.h    \
        timestats.h     \
+       util.h  \
        version_info.h
 
 # sources for Tethereal taps
@@ -209,7 +210,8 @@ editcap_SOURCES = \
 
 # dftest specifics
 dftest_SOURCES =       \
-       dftest.c
+       dftest.c        \
+       util.c
 
 # randpkt specifics
 randpkt_SOURCES = \

diff --git a/epan/Makefile.common b/epan/Makefile.common
index e25f5ac79c721087e7dbbb867039e836e56e6015..c1d723fe060c5790145b1225043eea653c384a55 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -111,7 +111,6 @@ DISSECTOR_SUPPORT_SRC =     \
        ../sha1.c       \
        ../t35.c        \
        ../tap.c        \
-       ../util.c       \
        ../xdlc.c       \
        ../xmlstub.c