From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 4 Jul 2015 15:50:51 +0000 (+0200)
Subject: Makefile: Always include release rules
X-Git-Tag: eaton-0.5.5~31
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/rpp-test-sw.git/commitdiff_plain/db13ceeb88e638f550b472d594dc518cb52a976e?ds=sidebyside

Makefile: Always include release rules

Conditional inclusion broke release procedure of rpp-simulink.
---

diff --git a/Makefile b/Makefile
index 0d8aa0a..83dd040 100644
--- a/Makefile
+++ b/Makefile
@@ -47,11 +47,6 @@ 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
@@ -83,4 +78,3 @@ $(RELEASE_BASENAME):: lib
 
 lib:
 	$(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Debug
-endif