diff options
| -rw-r--r-- | Makefile.nmake | 8 | ||||
| -rw-r--r-- | codecs/Makefile.nmake | 2 | ||||
| -rw-r--r-- | gtk/Makefile.nmake | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index e828023aeb..49410119a0 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -152,20 +152,20 @@ wiretap\wiretap-$(WTAP_VERSION).lib: wiretap !IFNDEF GTK1_DIR wireshark.exe : !ELSE -wireshark.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\libcodec.lib gtk\libui.lib plugins +wireshark.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) codecs\libcodec.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res << !ENDIF !IFNDEF GTK2_DIR wireshark-gtk2.exe : !ELSE -wireshark-gtk2.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) codecs epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\libcodec.lib gtk2.tmp\libui.lib plugins +wireshark-gtk2.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) codecs epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk2.tmp\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) codecs\libcodec.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) codecs\codecs.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res << !ENDIF diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake index a7822d63ac..c4c0971a8b 100644 --- a/codecs/Makefile.nmake +++ b/codecs/Makefile.nmake @@ -3,7 +3,7 @@ # # $Id$ -include ..\..\config.nmake +include ..\config.nmake ############### no need to modify below this line ######### diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index af91fe9733..d4db8714e6 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -67,8 +67,6 @@ pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c clean: rm -f $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.lib $(PDB_FILE) doxygen.cfg html/*.* if exist html rmdir html - cd codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. distclean: clean |