From aad9f294f91021f50c93df3f2720bccd1e275a1a Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 4 Jul 2015 17:33:37 +0200
Subject: [PATCH] Makefile: Rework release target

---
 Makefile | 9 ++++++++-
 rpp-lib  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2761ab9..0d8aa0a 100644
--- 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 0d7c857..5f5cb28 160000
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 0d7c857a8b13ded2f698614f644524d73e907fc7
+Subproject commit 5f5cb285cd0a3a9bb79a72f5a91d84fff6c48ebc
-- 
2.39.2