Fix path and name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19120 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index e828023aeb9ef9abd7d571171ebe1efbbbcd04d5..49410119a05c577339d17832af8d79ed84e97803 100644 (file)
--- 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 a7822d63acf223caae2008529e57fd89c70facc2..c4c0971a8b58a14f7ba6948c04765b3e868f4ccf 100644 (file)
--- 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 af91fe973398e4daeb974a9e39de174d9dcfc9fa..d4db8714e64c72b168889c6358957c9678375542 100644 (file)
--- 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