minor cleanup for making codecs

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

diff --git a/Makefile.nmake b/Makefile.nmake
index aca12f609bcf24c278351c9edfd0c11b3ff76758..7d18ea80ca5dd5185aa63cc47d9cd3ca3232689e 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -393,7 +393,7 @@ wiretap::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
 
-codecs:: help config.h svnversion.h AUTHORS-SHORT doxygen
+codecs::
         cd codecs
         $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
         cd ..

diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake
index c4c0971a8b58a14f7ba6948c04765b3e868f4ccf..47aaf281e32f7ecc23ec2ed0fc9777ef8f885420 100644 (file)
--- a/codecs/Makefile.nmake
+++ b/codecs/Makefile.nmake
@@ -7,11 +7,7 @@ include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GLIB_CFLAGS) \
-       /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
-       /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
-       /I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \
-       /I$(NET_SNMP_DIR)\win32 /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \
+CFLAGS=-DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
 
 .c.obj::
        $(CC) $(CFLAGS)  -Fd.\ -c $<
@@ -26,10 +22,10 @@ codecs.lib  :  $(CODEC_OBJECTS)
 
 
 G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h
-        $(CC) $(CFLAGS) -c /Zi /W1 /Od G711a\G711adecode.c -o $@
+       $(CC) $(CFLAGS) -Fd.\ -c G711a\G711adecode.c -o $@
 
 G711udecode.obj: G711u\G711udecode.c G711u\G711udecode.h G711u\G711utable.h
-        $(CC) $(CFLAGS) -c /Zi /W1 /Od G711u\G711udecode.c -o $@
+       $(CC) $(CFLAGS) -Fd.\ -c G711u\G711udecode.c -o $@
 
 clean:
         rm -f $(CODEC_OBJECTS) codecs.lib *.pdb

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index d4db8714e64c72b168889c6358957c9678375542..e508398ae0ce8ab368b34e2827ff28f70d247ff4 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -67,7 +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 ..
 
 distclean: clean