aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorLars Roland <Lars.Roland@gmx.net>2005-02-10 01:26:19 +0000
committerLars Roland <Lars.Roland@gmx.net>2005-02-10 01:26:19 +0000
commit338bda08bdaef8dafe29795bacdbdf823f18ed91 (patch)
tree50f2ca2a02dae76708e66ea79c1668875379aecb /Makefile.nmake
parent034a6f9b57db5320b723d6d254e7cd76f4627c04 (diff)
downloadwireshark-338bda08bdaef8dafe29795bacdbdf823f18ed91.tar.gz
wireshark-338bda08bdaef8dafe29795bacdbdf823f18ed91.tar.bz2
wireshark-338bda08bdaef8dafe29795bacdbdf823f18ed91.zip
clean up makefiles.
especially /trunk/Makefile.nmake doesn't have to include /trunk/epan/Makefile.common anymore. svn path=/trunk/; revision=13368
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake8
1 files changed, 1 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 01a4694514..826378b2e7 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -27,15 +27,9 @@ PLATFORM_SRC = capture-wpcap.c
include Makefile.common
-include epan\Makefile.common
-
BUILT_SOURCES = $(BUILT_SOURCES) \
svnversion.h
-DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=)
-
ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
@@ -352,7 +346,7 @@ gtk2:: help config.h svnversion.h AUTHORS-SHORT
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
cd ..
-epan:: $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) $(RESOURCES) $(BUILT_SOURCES) doxygen
+epan:: $(EXTRA_OBJECTS) $(RESOURCES) $(BUILT_SOURCES) doxygen
cd epan
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..