diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-01-11 22:17:43 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-01-11 22:17:43 +0000 |
| commit | b97626862eec54d4cb8f6ebc4bc58e28e2479ec8 (patch) | |
| tree | c815997640931558110ea9bf468fcb27f04f4c0d /Makefile.nmake | |
| parent | 8e6ece35e687032e9ca692f9bc7f3d50801082be (diff) | |
Rename DISSECTOR_HELPER_{SRC,OBJECTS} to
DISSECTOR_SUPPORT_{SRC,OBJECTS}.
Add some additional files, required by dissectors, to those lists.
Extract the stuff to get version information strings for libraries and
the OS, which is *not* needed by dissectors, from "util.c", which
contains routines that *are* needed by dissectors, and put it into a
separate file.
Make "dftest" link only with the dissector support stuff, not with all
of the Ethereal common files.
svn path=/trunk/; revision=9645
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index fbd07677d7..0d4e15968c 100644 --- 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.385 2004/01/10 04:09:14 guy Exp $ +# $Id: Makefile.nmake,v 1.386 2004/01/11 22:17:42 guy Exp $ include config.nmake include <win32.mak> @@ -446,47 +446,48 @@ TETHEREAL_TAP_SRC = \ TETHEREAL_TAP_OBJECTS = $(TETHEREAL_TAP_SRC:.c=.obj) -DISSECTOR_HELPER_OBJECTS = \ +DISSECTOR_SUPPORT_OBJECTS = \ adler32.obj \ afn.obj \ asn1.obj \ + column.obj \ crc32.obj \ crypt-des.obj \ crypt-md4.obj \ crypt-md5.obj \ crypt-rc4.obj \ + follow.obj \ g711.obj \ h225-persistentdata.obj \ in_cksum.obj \ ipproto.obj \ packet-dcerpc-nt.obj \ + prefs.obj \ ptvcursor.obj \ reassemble.obj \ req_resp_hdrs.obj \ t35.obj \ - xdlc.obj + tap.obj \ + util.obj \ + xdlc.obj \ + xmlstub.obj ETHEREAL_COMMON_OBJECTS = \ - $(DISSECTOR_HELPER_OBJECTS) \ + $(DISSECTOR_SUPPORT_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 \ range.obj \ register.obj \ ringbuffer.obj \ - tap.obj \ timestats.obj \ - util.obj \ - xmlstub.obj + version_info.c ethereal_OBJECTS = \ $(DISSECTOR_OBJECTS) \ @@ -506,7 +507,7 @@ tethereal_OBJECTS = \ dftest_OBJECTS = \ $(DISSECTOR_OBJECTS) \ - $(ETHEREAL_COMMON_OBJECTS) \ + $(DISSECTOR_SUPPORT_OBJECTS) \ dftest.obj randpkt_OBJECTS = \ |