]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/blobdiff - Makefile
Fix endianing for 16bit port channels
[pes-rpp/rpp-test-sw.git] / Makefile
index 0d8aa0a6ba9d851586b00056f1caaaccad939312..165a428bc743feafdc7ac1808572b0c4e26fd8ea 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
@@ -67,20 +62,18 @@ RELEASE_LIB_GIT_FILES = \
        os/$(rpp_lib_OS)/include/ \
        rpp/include/
 
-ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
-RELEASE_LIB_GIT_FILES += lwip/src/include/
-endif
-
 RELEASE_LIB_GEN_FILES = Makefile.config build/$(RELEASE_TARGET)/Debug/rpp-lib.lib
 
 $(RELEASE_BASENAME):: lib
        @echo 'Generate version.h from git'
        mkdir -p $@/rpp-test-sw/Debug
        $(MAKE) -C $@/rpp-test-sw/Debug -f $(CURDIR)/rpp-test-sw/Makefile.version version.h
-
        git --git-dir=rpp-lib/.git archive --worktree-attributes --prefix=$@/rpp-lib/ HEAD $(RELEASE_LIB_GIT_FILES) | tar xf -
+ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
+       git --git-dir=rpp-lib/lwip/.git archive --worktree-attributes --prefix=$@/rpp-lib/lwip/ HEAD src/include/ | tar xf -
+endif
        cp --parents  $(RELEASE_LIB_GEN_FILES:%=rpp-lib/%) $@/
 
 lib:
+       $(MAKE) -C rpp-lib .git/info/attributes # Setup ignored files
        $(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Debug
-endif