Hmmm, don't optimize too much :-)

also fix the clean_setup

svn path=/trunk/; revision=19199
This commit is contained in:
Ulf Lamping 2006-09-12 01:04:35 +00:00
parent 04fe34d711
commit b16e2c43c5
1 changed files with 18 additions and 7 deletions

View File

@ -8,6 +8,9 @@ include <win32.mak>
############### no need to modify below this line #########
CC = cl
LINK= link
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
@ -37,14 +40,14 @@ EXTRA_OBJECTS = \
wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib shell32.lib comctl32.lib \
$(NET_SNMP_LIBS) \
$(HHC_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
!ELSE
epan\dissectors\dissectors.lib \
epan\wireshark.lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
$(NET_SNMP_LIBS) \
$(HHC_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
@ -54,13 +57,13 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
!ELSE
epan\dissectors\dissectors.lib \
epan\wireshark.lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
$(NET_SNMP_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
@ -612,13 +615,21 @@ setup: verify_tools
# Cleanup files installed by the setup target. It will not remove the
# downloaded zip files.
clean_setup:
rm -r -f $(WIRESHARK_LIBS)/glib
rm -r -f $(WIRESHARK_LIBS)/gtk+
rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05
rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.13.1
rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
rm -r -f $(WIRESHARK_LIBS)/glib
rm -r -f $(WIRESHARK_LIBS)/gnutls-1.5.0-1
rm -r -f $(WIRESHARK_LIBS)/gtk2
rm -r -f $(WIRESHARK_LIBS)/gtk+
rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
rm -r -f $(WIRESHARK_LIBS)/lua5.1
rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.3.1
rm -r -f $(WIRESHARK_LIBS)/pcre-6.4
rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1
rm -r -f $(WIRESHARK_LIBS)/WpdPack
rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
################################################################################
# Prepare the source tree for running (t)wireshark directly from there.