diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-12 22:27:41 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-12 22:27:41 +0000 |
| commit | a36e595c8dbc917ce20ba6dbeef7cf5c8f5caef0 (patch) | |
| tree | 7ab8197cb216b0dae18375094603a6aca5582045 /Makefile.nmake | |
| parent | 86a6a0c2a4386b287333cdb5626b1525a8ea5b89 (diff) | |
| download | wireshark-a36e595c8dbc917ce20ba6dbeef7cf5c8f5caef0.tar.gz wireshark-a36e595c8dbc917ce20ba6dbeef7cf5c8f5caef0.tar.bz2 wireshark-a36e595c8dbc917ce20ba6dbeef7cf5c8f5caef0.zip | |
Don't try to build NSIS installer if MAKENSIS not defined in config.nmake.
Fixes Bug #3362.
Also: Use _FORCE_ instead of FORCE as dummy target.
svn path=/trunk/; revision=31510
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 367c9fa6ef..a19af023e6 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -197,12 +197,19 @@ RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \ all: $(LIBS_CHECK) config.h tools image codecs $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil wiretap epan $(EXECUTABLES) $(RESOURCES) doc help install-all +!IFDEF MAKENSIS packaging: all cd packaging cd nsis $(MAKE) /$(MAKEFLAGS) -f makefile.nmake cd .. cd .. +!ELSE +packaging: _FORCE_ + @echo ? NSIS not available (MAKENSIS not defined in config.nmake) + @echo. + @exit 1 +!ENDIF packaging_u3: all cd packaging @@ -738,14 +745,12 @@ $(LIBS_CHECK): $(CHECK_TAG) config.nmake Makefile.nmake # Target for "checktag failed" (libraries not up to date). # Defined only if "checktag" failed (see beginning of this Makefile). !IF "$(CHECK_TAG)" != "" -$(CHECK_TAG): FORCE +$(CHECK_TAG): _FORCE_ @echo \? Wireshark Libraries not up-to-date \? @echo \? Do you need to run "nmake -f Makefile.nmake setup" \? @echo. @exit 1 -FORCE: ## Assumption: no file named FORCE exists in the current directory - !ENDIF # Download (if needed) and install all the required libraries into WIRESHARK_LIBS. @@ -1097,3 +1102,7 @@ checkapi: checkapi_local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi cd ../wsutil $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi + +#### +_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory + |