diff options
| -rw-r--r-- | Makefile.nmake | 15 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 11 |
2 files changed, 23 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 + diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 25b58251c5..e7c19f1518 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -74,7 +74,14 @@ NSI=wireshark.nsi \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) +!IFDEF MAKENSIS all: NEWS.txt wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe +!ELSE +all: _FORCE_ + @echo ? NSIS not available (MAKENSIS not defined in config.nmake) + @echo. + @exit 1 +!ENDIF NEWS.txt: ../../NEWS $(UNIX2DOS) < ../../NEWS > NEWS.txt @@ -185,3 +192,7 @@ $(EXE) $(DLL): cd ../.. $(MAKE) /$(MAKEFLAGS) -f makefile.nmake cd packaging/nsis + +#### +_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory + |