diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-07-25 00:37:29 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-07-25 00:37:29 +0000 |
| commit | 6d0149175a6301423b98ea724f125a275af5d47d (patch) | |
| tree | f0c524f2d60331fae7d736b3fd8bab6c94af5a58 /Makefile.nmake | |
| parent | 2286e329b22b00172c4a7f7189c04dd1b9927568 (diff) | |
Make sure wireshark.exe and tshark.exe don't depend on pseudotargets.
svn path=/trunk/; revision=43978
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 12d7a3134e..6bd89441a0 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -288,7 +288,7 @@ $(RESOURCES): image wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap -wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui ui\gtk ui\win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins +wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui gtk win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins @echo Linking $@ $(LINK) @<< /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_OBJECTS) image\wireshark.res image\file_dlg_win32.res @@ -297,7 +297,7 @@ wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui ui\gt mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 !ENDIF -tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui ui\cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins +tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins @echo Linking $@ $(LINK) @<< /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) ui\cli\libcliui.lib ui\libui.lib image\tshark.res @@ -717,26 +717,34 @@ codecs:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. -ui:: help config.h svnversion.h doxygen +ui\libui.lib: cd ui $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib cd .. -gtk:: help config.h svnversion.h doxygen +ui:: help config.h svnversion.h doxygen ui\libui.lib + +ui\gtk\libgtkui.lib: cd ui/gtk $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib cd ../.. -win32:: +gtk:: help config.h svnversion.h doxygen ui\gtk\libgtkui.lib + +ui\win32\libgtkui_win32.lib: cd ui/win32 $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib cd ../.. -cli:: help config.h svnversion.h doxygen +win32:: ui\win32\libgtkui_win32.lib + +ui\cli\libcliui.lib: cd ui/cli $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcliui.lib cd ../.. +cli:: help config.h svnversion.h doxygen ui\cli\libcliui.lib + epan:: $(RESOURCES) $(ZLIB_DLL) wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen cd epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake |