diff options
| author | Lars Roland <Lars.Roland@gmx.net> | 2006-02-09 07:03:54 +0000 |
|---|---|---|
| committer | Lars Roland <Lars.Roland@gmx.net> | 2006-02-09 07:03:54 +0000 |
| commit | 95ecdf78c11ff7fef8c245a3f514b3ff317ad87a (patch) | |
| tree | 1789a735f944e1ebca83995b7cbba76daff2447d /epan | |
| parent | 5b46139a57e97fc31acf4a900731fcb9e0dfd9ba (diff) | |
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
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.nmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 9c323b48b0..9d22cd705c 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -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) \ |