diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-01-26 21:12:41 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-01-26 21:12:41 +0000 |
| commit | c6201489da328f9c7add98cce479bd4e69b864b0 (patch) | |
| tree | 92605ed5816face2da489e2655a21eda60c1cf29 /Makefile.nmake | |
| parent | a165b0d6bec7d2186d6106f145d8b123ea93077f (diff) | |
updated NSIS generation to build GTK version 1 or 2,
added new target "packaging" to root Makefile.nmake,
which will generate version 1 or 2 or both,
depending on config.nmake GTK?_DIR setting
svn path=/trunk/; revision=9866
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1fdc00c083..bf6204dbc8 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.397 2004/01/24 20:01:35 ulfl Exp $ +# $Id: Makefile.nmake,v 1.398 2004/01/26 21:12:40 ulfl Exp $ include config.nmake include <win32.mak> @@ -169,6 +169,18 @@ RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergeca all: tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc +packaging: all + cd packaging + cd nsis +!IFDEF GTK1_DIR + nmake -f makefile.nmake GTK1="USE" +!ENDIF +!IFDEF GTK2_DIR + nmake -f makefile.nmake GTK2="USE" +!ENDIF + cd .. + cd .. + $(RESOURCES): image wiretap\wiretap-$(WTAP_VERSION).lib: wiretap |