Modify the "setup" target to download the packages we've defined, so that we

don't download the GTK1 packages unless we have GTK1_DIR defined.

svn path=/trunk/; revision=10579
This commit is contained in:
Ulf Lamping 2004-04-10 07:29:14 +00:00
parent dba256262a
commit 55c3178e95
1 changed files with 3 additions and 1 deletions

View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.413 2004/04/09 16:54:06 gerald Exp $
# $Id: Makefile.nmake,v 1.414 2004/04/10 07:29:14 ulfl Exp $
include config.nmake
include <win32.mak>
@ -370,10 +370,12 @@ setup: verify_apps
glib glib-2.2.3-20040116.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
glib glib-dev-2.2.3-20040116.zip
!IFDEF GTK1_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk+ gtk+-1.3.0-20030717.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk+ gtk+-dev-1.3.0-20030115.zip
!ENDIF
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \