[iortcw] 37/497: All: Don't use zip target in Makefile unless BUILD_ARCHIVE define is set

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit eb3d8218f3817781174d1b759ae0fc1932bfcd82
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Wed Feb 5 20:05:11 2014 +0000

    All: Don't use zip target in Makefile unless BUILD_ARCHIVE define is set
---
 MP/Makefile | 17 +++++++++++++----
 SP/Makefile | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 52850e6..7286192 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -38,6 +38,9 @@ endif
 ifndef BUILD_RENDERER_REND2
   BUILD_RENDERER_REND2 = 
 endif
+ifndef BUILD_ARCHIVE
+  BUILD_ARCHIVE = 0
+endif
 
 #############################################################################
 #
@@ -1280,17 +1283,23 @@ endif
 	@echo "  Output:"
 	$(call print_list, $(NAKED_TARGETS))
 	@echo ""
-ifneq ($(TARGETS),)
-  ifndef DEBUG_MAKEFILE
+ifneq ($(BUILD_ARCHIVE),0)
+  ifneq ($(TARGETS),)
+    ifndef DEBUG_MAKEFILE
 	@$(MAKE) $(TARGETS) $(B).zip V=$(V)
+    endif
+  endif
+else
+  ifneq ($(TARGETS),)
+    ifndef DEBUG_MAKEFILE
+	@$(MAKE) $(TARGETS) V=$(V)
+    endif
   endif
 endif
 
 $(B).zip: $(TARGETS)
-ifdef ARCHIVE
 	@rm -f $@
 	@(cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
-endif
 
 makedirs:
 	@if [ ! -d $(BUILD_DIR) ];then $(MKDIR) $(BUILD_DIR);fi
diff --git a/SP/Makefile b/SP/Makefile
index 7601be7..bcbd997 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -38,6 +38,9 @@ endif
 ifndef BUILD_RENDERER_REND2
   BUILD_RENDERER_REND2 = 
 endif
+ifndef BUILD_ARCHIVE
+  BUILD_ARCHIVE = 0
+endif
 
 #############################################################################
 #
@@ -1288,17 +1291,23 @@ endif
 	@echo "  Output:"
 	$(call print_list, $(NAKED_TARGETS))
 	@echo ""
-ifneq ($(TARGETS),)
-  ifndef DEBUG_MAKEFILE
+ifneq ($(BUILD_ARCHIVE),0)
+  ifneq ($(TARGETS),)
+    ifndef DEBUG_MAKEFILE
 	@$(MAKE) $(TARGETS) $(B).zip V=$(V)
+    endif
+  endif
+else
+  ifneq ($(TARGETS),)
+    ifndef DEBUG_MAKEFILE
+	@$(MAKE) $(TARGETS) V=$(V)
+    endif
   endif
 endif
 
 $(B).zip: $(TARGETS)
-ifdef ARCHIVE
 	@rm -f $@
 	@(cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
-endif
 
 makedirs:
 	@if [ ! -d $(BUILD_DIR) ];then $(MKDIR) $(BUILD_DIR);fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git