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 /Makefile.nmake | |
| parent | 9ae290b98cef67498f603bc408807d8331394ab1 (diff) | |
From Lars Roland: Fix a couple of MSVC build problems.
svn path=/trunk/; revision=10439
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 07f09fde06..aac6423db7 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.409 2004/03/02 18:55:30 ulfl Exp $ +# $Id: Makefile.nmake,v 1.410 2004/03/22 20:35:07 gerald Exp $ include config.nmake include <win32.mak> @@ -27,11 +27,23 @@ PLATFORM_SRC = capture-wpcap.c include Makefile.common -ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj) +include epan\Makefile.common -tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj) +DISSECTOR_SRC = $(DISSECTOR_SRC:../=) +DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) -dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) +DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=) +DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) + +# remove register.obj from "DISSECTOR_SUPPORT_OBJECTS". +# creation and compilation of register.c has been moved to epan. +DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:register.obj=) + +ethereal_OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(ethereal_SOURCES:.c=.obj) + +tethereal_OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(tethereal_SOURCES:.c=.obj) + +dftest_OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(dftest_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) |