]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commitdiff
Makefile: Always include release rules eaton
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 4 Jul 2015 15:50:51 +0000 (17:50 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 4 Jul 2015 15:50:51 +0000 (17:50 +0200)
Conditional inclusion broke release procedure of rpp-simulink.

Makefile

index 0d8aa0a6ba9d851586b00056f1caaaccad939312..83dd040457e5fe0cd2f4573092a742a4c5d214d8 100644 (file)
--- 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