diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-07-17 12:49:34 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-07-17 12:49:34 +0000 |
| commit | 31b5d74f551c692dfb060608c41a9fcd76fb09ce (patch) | |
| tree | 13681ae753dbb33713a5bfde81fbdbdfab65310d | |
| parent | f5e2f3a6e6a2bd214bd7a8a334cff5db15ae402f (diff) | |
Changed dependencies, so image dir will be generated before epan, otherwise the libethereal.res file will not be available when needed to link libethereal.dll
svn path=/trunk/; revision=11394
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a9b130625c..1c84796759 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -116,7 +116,7 @@ EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe editcap.exe mergecap.ex RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res -all: config.h tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc +all: config.h tools image wiretap epan $(EXECUTABLES) $(RESOURCES) doc packaging: all cd packaging @@ -360,7 +360,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:: packet-ncp2222.c x11-declarations.h x11-register-info.h dissectors.lib doxygen +epan:: $(RESOURCES) packet-ncp2222.c x11-declarations.h x11-register-info.h dissectors.lib doxygen cd epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. |