diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-03-22 20:35:07 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-03-22 20:35:07 +0000 |
| commit | 233dadebd3bffff0af2cc644315db10e32e3a6bf (patch) | |
| tree | a2e4ad29e3dd92f066f55110f5758a34992dbd9c /epan/Makefile.nmake | |
| parent | 9ae290b98cef67498f603bc408807d8331394ab1 (diff) | |
| download | wireshark-233dadebd3bffff0af2cc644315db10e32e3a6bf.tar.gz | |
From Lars Roland: Fix a couple of MSVC build problems.
svn path=/trunk/; revision=10439
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index f772b81b35..a66d0aea37 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -1,15 +1,15 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.37 2004/03/18 19:04:31 obiot Exp $ +# $Id: Makefile.nmake,v 1.38 2004/03/22 20:35:07 gerald Exp $ include ..\config.nmake +include Makefile.common ############### no need to modify below this line ######### CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ $(ADNS_CFLAGS) $(PCRE_CFLAGS) /I$(PCAP_DIR)\include \ - $(ZLIB_CFLAGS) /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \ -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -19,21 +19,8 @@ libethereal_LIBS = \ wsock32.lib user32.lib \ $(GLIB_LIBS) -# .c.obj:: -# $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< - -include Makefile.common - -DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) -DISSECTOR_OBJECTS = $(DISSECTOR_OBJECTS:../=) - -DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) -DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=) - .c.obj:: - $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $(DISSECTOR_SRC) - $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $(DISSECTOR_SUPPORT_SRC) - $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< OBJECTS=addr_and_mask.obj \ atalk-utils.obj \ @@ -54,15 +41,14 @@ OBJECTS=addr_and_mask.obj \ packet.obj \ plugins.obj \ proto.obj \ + register.obj \ resolv.obj \ sna-utils.obj \ strutil.obj \ timestamp.obj \ to_str.obj \ tvbuff.obj \ - value_string.obj -# $(DISSECTOR_OBJECTS) \ -# $(DISSECTOR_SUPPORT_OBJECTS) + value_string.obj all: ftypes dfilter ethereal.lib @@ -71,8 +57,8 @@ all: ftypes dfilter ethereal.lib #ethereal.dll ethereal.lib : config.h $(OBJECTS) # link /DLL /out:ethereal.dll $(OBJECTS) $(libethereal_LIBS) -ethereal.lib : config.h $(OBJECTS) $(DISSECTOR_SUPPORT_SRC) $(DISSECTOR_SRC) - lib /out:ethereal.lib $(OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(DISSECTOR_OBJECTS) +ethereal.lib : config.h $(OBJECTS) + lib /out:ethereal.lib $(OBJECTS) config.h : config.h.win32 ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ @@ -81,7 +67,7 @@ config.h : config.h.win32 ..\config.nmake < config.h.win32 > $@ clean: - rm -f $(OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(DISSECTOR_OBJECTS) ethereal.lib $(PDB_FILE) + rm -f $(OBJECTS) ethereal.lib $(PDB_FILE) cd ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../dfilter @@ -141,9 +127,8 @@ dfilter:: config.h register.c: $(DISSECTOR_SRC) !IFDEF PYTHON @echo Making register.c (using python) - @$(PYTHON) ../make-reg-dotc.py . $(DISSECTOR_SRC) + @$(PYTHON) ..\make-reg-dotc.py . $(DISSECTOR_SRC) !ELSE @echo Making register.c (using sh) @$(SH) ../make-reg-dotc register.c . $(DISSECTOR_SRC) !ENDIF - |