Makefile: Rework release target

diff --git a/Makefile b/Makefile
index 2761ab96ef0350602651b04d19e3f5893d7f58e4..0d8aa0a6ba9d851586b00056f1caaaccad939312 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ include rpp-lib/Makefile.var
 all: rpp-test-sw
        $(call rmdir,$(TMP_WORKSPACE))
 
-RELEASE_PREFIX = rpp-test-sw
 include rpp-lib/common.mk
 
 TARGET ?= $(error TARGET variable not defined)
@@ -48,6 +47,13 @@ uncrustify:
        git diff --quiet # Check that the tree is clean
        $(UNCRUSTIFY_ALL)
 
+ifeq (release,$(or $(filter release,$(MAKECMDGOALS)),$(RELEASE_IN_PROGRESS)))
+
+# Evaluate this block also by all sub-makes
+export RELEASE_IN_PROGRESS = release
+
+$(eval $(call release_rules,rpp-test-sw))
+
 release: $(RELEASE_BASENAME).zip
 
 RELEASE_TARGET = $(TARGET)
@@ -77,3 +83,4 @@ $(RELEASE_BASENAME):: lib
 
 lib:
        $(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Debug
+endif

diff --git a/rpp-lib b/rpp-lib
index 0d7c857a8b13ded2f698614f644524d73e907fc7..5f5cb285cd0a3a9bb79a72f5a91d84fff6c48ebc 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 0d7c857a8b13ded2f698614f644524d73e907fc7
+Subproject commit 5f5cb285cd0a3a9bb79a72f5a91d84fff6c48ebc