Change license to MIT

[jenkicar/rpp-simulink.git] / Makefile

diff --git a/Makefile b/Makefile
index af23d737c3893b486719cd315119a7ca77414835..e9e3f4feb6a0c6a07f5302c9afdcbfcca9845f82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,19 @@ release4eaton:
 release4us:
        $(MAKE) release RELEASE_TARGET=tms570_rpp RELEASE_ATTR=
 
+.PHONY: commit-lib-update
+commit-lib-update:
+       test $$($(TESTSW_LIB_COMMIT)) = $$($(SIMULINK_LIB_COMMIT))
+       if git --git-dir=doc/test-sw/.git diff-index --quiet HEAD -- rpp-lib; \
+       then echo "Nothing to commit in test-sw"; \
+       else git --git-dir=doc/test-sw/.git commit -m "Update lib submodule" rpp-lib; \
+       fi
+       git commit  -m "Update lib submodule" doc/test-sw rpp/lib
+
+TESTSW_LIB_COMMIT = git --git-dir=doc/test-sw/rpp-lib/.git rev-parse HEAD
+SIMULINK_LIB_COMMIT = git --git-dir=rpp/lib/.git rev-parse HEAD
+
+
 ifeq ($(or $(release_in_progress),$(MAKECMDGOALS)),release)
 export release_in_progress = release
 
@@ -17,9 +30,6 @@ include rpp/lib/build/$(RELEASE_TARGET)/Makefile.config
 
 $(eval $(call release_rules,rpp-simulink))
 
-TESTSW_LIB_COMMIT = git --git-dir=doc/test-sw/rpp-lib/.git rev-parse HEAD
-SIMULINK_LIB_COMMIT = git --git-dir=rpp/lib/.git rev-parse HEAD
-
 release: $(RELEASE_BASENAME).zip
        if [ $$($(SIMULINK_LIB_COMMIT)) != $$($(TESTSW_LIB_COMMIT)) ]; then echo >&2 "Library version mismatch"; exit 1; fi
        cp rpp/lib/$(shell make -C rpp/lib --silent print-release-basename).zip .
@@ -37,16 +47,15 @@ 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 rpp-lib.lib
+RELEASE_LIB_GEN_FILES = Makefile.config rpp-lib.lib build/gio_names.txt
 
 $(RELEASE_BASENAME):: LIB_RELEASE_BASENAME:=$(shell make -C rpp/lib --silent print-release-basename)
 $(RELEASE_BASENAME):: release-lib
 # Copy library headers and binaries
        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/%) $@/
 # Compile and include the PDF documentation
        $(MAKE) -C doc
@@ -54,7 +63,11 @@ $(RELEASE_BASENAME):: release-lib
        cp doc/rpp_simulink.pdf $@/doc
 
 release-lib:
-       $(MAKE) -C rpp/lib/build/$(RELEASE_TARGET)/Release # Compile the lib
-       $(MAKE) -C rpp/lib release # Create release zip and directory
+# Compile the lib
+       $(MAKE) -C rpp/lib/build/$(RELEASE_TARGET)/Release
+# Create release zip and directory. Note that this also setups ignored
+# files, which is required for correct function of $(RELEASE_BASENAME)
+# target.
+       $(MAKE) -C rpp/lib release
 
 endif # release