aboutsummaryrefslogtreecommitdiffstats
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
parent034a6f9b57db5320b723d6d254e7cd76f4627c04 (diff)
clean up makefiles.
especially /trunk/Makefile.nmake doesn't have to include /trunk/epan/Makefile.common anymore. svn path=/trunk/; revision=13368
-rw-r--r--Makefile.nmake8
-rw-r--r--epan/Makefile.am3
-rw-r--r--epan/Makefile.common2
-rw-r--r--epan/Makefile.nmake18
-rw-r--r--epan/dissectors/Makefile.nmake2
5 files changed, 6 insertions, 27 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 ..
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 1214e92a70..374a88e303 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -38,8 +38,7 @@ INCLUDES = -I$(srcdir)/..
libethereal_la_SOURCES = \
$(LIBETHEREAL_SRC) \
- $(LIBETHEREAL_INCLUDES) \
- $(DISSECTOR_SUPPORT_SRC)
+ $(LIBETHEREAL_INCLUDES)
EXTRA_libethereal_la_SOURCES = \
g_ascii_strtoull.c \
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 4002bd54b2..3f3b79c4a4 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -142,6 +142,4 @@ LIBETHEREAL_INCLUDES = \
xdlc.h \
xmlstub.h
-# dissector helpers (needed from the dissectors, but not a dissector itself)
-DISSECTOR_SUPPORT_SRC =
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 3f935b254d..f3a7802112 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -28,9 +28,6 @@ libethereal_LIBS = \
dfilter\dfilter.lib \
dissectors\dissectors.lib
-# declare before .c.obj::
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
@@ -45,9 +42,6 @@ EXTRA_OBJECTS = \
../mkstemp.obj \
../strptime.obj
-#EXTRA_SRC = $(EXTRA_SRC:../=)
-#EXTRA_OBJECTS = $(EXTRA_SRC:.c=.obj)
-
!IFDEF ENABLE_LIBETHEREAL
all: ftypes dfilter dissectors libethereal.dll
@@ -59,23 +53,19 @@ all: ftypes dfilter dissectors ethereal.lib
libethereal.lib: libethereal.dll
libethereal.exp: libethereal.dll
-#DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
-#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=)
-
-libethereal.dll: ..\config.h $(LIBETHEREAL_OBJECTS) libethereal.def ftypes dfilter dissectors $(DISSECTOR_SUPPORT_OBJECTS) doxygen $(EXTRA_OBJECTS) ..\image\libethereal.res
+libethereal.dll: ..\config.h $(LIBETHEREAL_OBJECTS) libethereal.def ftypes dfilter dissectors doxygen $(EXTRA_OBJECTS) ..\image\libethereal.res
@echo Linking libethereal.dll
$(link) $(dlllflags) $(conlibsdll) \
$(LOCAL_LDFLAGS) \
/DEF:libethereal.def /OUT:libethereal.dll \
/IMPLIB:libethereal.lib $(LIBETHEREAL_OBJECTS) \
$(libethereal_LIBS) ..\image\libethereal.res \
- dissectors\register.obj $(DISSECTOR_SUPPORT_OBJECTS) \
+ dissectors\register.obj \
$(EXTRA_OBJECTS)
ethereal.lib : ..\config.h $(LIBETHEREAL_OBJECTS) $(EXTRA_OBJECTS)
link /lib /out:ethereal.lib $(LIBETHEREAL_OBJECTS) \
- $(EXTRA_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
+ $(EXTRA_OBJECTS)
..\config.h : ..\config.h.win32 ..\config.nmake
cd ..
@@ -83,7 +73,7 @@ ethereal.lib : ..\config.h $(LIBETHEREAL_OBJECTS) $(EXTRA_OBJECTS)
cd epan
clean:
- rm -f $(LIBETHEREAL_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg html/*.*
+ rm -f $(LIBETHEREAL_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg html/*.*
if exist html rmdir html
cd ftypes
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 86a419b216..28dd4562c3 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -19,12 +19,10 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
-#DISSECTOR_SRC = $(DISSECTOR_SRC:../=)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-#dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(EXTRA_OBJECTS)
dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
@echo Linking dissectors.lib
link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)