osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Bill Meier 

The following patch prevents a windows nmake of Ethereal from
relinking libethereal.dll 
when DOXYGEN is not defined in config.nmake and
there are no changes to libethereal.dll dependents.

svn path=/trunk/; revision=17224
This commit is contained in:
Lars Roland 2006-02-09 07:03:54 +00:00
parent 5b46139a57
commit 95ecdf78c1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/Makefile.nmake
View File

@ -45,6 +45,10 @@ EXTRA_OBJECTS = \
strptime.obj
!IFDEF DOXYGEN
DOXYGEN_DEP=doxygen
!ENDIF
!IFDEF ENABLE_LIBETHEREAL
all: ftypes dfilter dissectors libethereal.dll
!ELSE
@ -55,7 +59,7 @@ all: ftypes dfilter dissectors ethereal.lib
libethereal.lib: libethereal.dll
libethereal.exp: libethereal.dll
libethereal.dll: ..\config.h $(LIBETHEREAL_OBJECTS) libethereal.def ftypes dfilter dissectors doxygen $(EXTRA_OBJECTS) ..\image\libethereal.res
libethereal.dll: ..\config.h $(LIBETHEREAL_OBJECTS) libethereal.def ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) ..\image\libethereal.res
@echo Linking libethereal.dll
$(link) $(dlllflags) $(conlibsdll) \
$(LOCAL_LDFLAGS) \