diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-04-10 07:29:14 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-04-10 07:29:14 +0000 |
| commit | 55c3178e95d72e5278fac31b2b956c5377fa9727 (patch) | |
| tree | 797e720691d81693dd3d22fd84af741719cf8af7 /Makefile.nmake | |
| parent | dba256262a9d6179c4aef68fd1af27ade53ef5ed (diff) | |
| download | wireshark-55c3178e95d72e5278fac31b2b956c5377fa9727.tar.gz wireshark-55c3178e95d72e5278fac31b2b956c5377fa9727.tar.bz2 wireshark-55c3178e95d72e5278fac31b2b956c5377fa9727.zip | |
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
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index eeddda9a9c..9aa77bc0d5 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -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)" \ |