diff options
author | Lars Roland <Lars.Roland@gmx.net> | 2005-02-10 01:26:19 +0000 |
---|---|---|
committer | Lars Roland <Lars.Roland@gmx.net> | 2005-02-10 01:26:19 +0000 |
commit | 338bda08bdaef8dafe29795bacdbdf823f18ed91 (patch) | |
tree | 50f2ca2a02dae76708e66ea79c1668875379aecb /epan/Makefile.nmake | |
parent | 034a6f9b57db5320b723d6d254e7cd76f4627c04 (diff) |
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 'epan/Makefile.nmake')
-rw-r--r-- | epan/Makefile.nmake | 18 |
1 files changed, 4 insertions, 14 deletions
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 |