make the Makefile.common really common between automake and nmake,

as lot's of definitions were used in the automake process only

svn path=/trunk/; revision=10176

1 files changed, 10 insertions, 72 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 248014f2b8..1b411a74d5 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.405 2004/02/18 20:45:54 gerald Exp $
+# $Id: Makefile.nmake,v 1.406 2004/02/22 08:30:41 ulfl Exp $
 
 include config.nmake
 include <win32.mak>
@@ -23,79 +23,17 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 .c.obj::
    $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
+PLATFORM_SRC = capture-wpcap.c
+
 include Makefile.common
 
-DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
-
-TETHEREAL_TAP_OBJECTS = $(TETHEREAL_TAP_SRC:.c=.obj)
-
-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		\
-	tap.obj		\
-	util.obj	\
-	xdlc.obj	\
-	xmlstub.obj
-
-ETHEREAL_COMMON_OBJECTS = \
-	$(DISSECTOR_SUPPORT_OBJECTS) \
-	capture_stop_conditions.obj \
-	capture-wpcap.obj \
-	cfile.obj       \
-	conditions.obj   \
-	disabled_protos.obj     \
-	getopt.obj	 \
-	pcap-util.obj    \
-	print.obj        \
-	ps.obj           \
-	range.obj        \
-	register.obj     \
-	ringbuffer.obj   \
-	timestats.obj   \
-	version_info.obj
-
-ethereal_OBJECTS = \
-	$(DISSECTOR_OBJECTS) \
-	$(ETHEREAL_COMMON_OBJECTS) \
-	alert_box.obj		\
-	capture.obj		\
-	file.obj         	\
-	filters.obj      	\
-	proto_hier_stats.obj	\
-	summary.obj
-
-tethereal_OBJECTS = \
-	$(DISSECTOR_OBJECTS) \
-	$(ETHEREAL_COMMON_OBJECTS) \
-	$(TETHEREAL_TAP_OBJECTS) \
-	tethereal-tap-register.obj \
-	tethereal.obj
-
-dftest_OBJECTS = \
-	$(DISSECTOR_OBJECTS) \
-	$(DISSECTOR_SUPPORT_OBJECTS) \
-	dftest.obj
-
-randpkt_OBJECTS = \
-	randpkt.obj
+ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
+
+tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
+
+dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
+
+randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj)
 
 EXTRA_OBJECTS = \
 #	snprintf.obj	\