Rewrite Makefile to use definitions from common.mk

This should allow building on Windows.

diff --git a/Makefile b/Makefile
index 6be686dbf6433418972b17cd84cda75764dafcf9..d5ab5eda8f6ba77dbd9799c623e275ce280bca91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,25 +4,24 @@
 # See http://processors.wiki.ti.com/index.php/Projects_-_Command_Line_Build/Create
 # and https://bugs.eclipse.org/bugs/show_bug.cgi?id=186847
 
-ECLIPSE=/opt/ti/ccsv5/eclipse/eclipse
-
-WORKSPACE:=$(shell mktemp --dry-run --tmpdir -d rpp-test-sw-workspace.XXXXXXXXXX)
+include rpp-lib/common.mk
 
 all: rpp-test-sw
-       rm -rf $(WORKSPACE)
+       $(call rmdir,$(TMP_WORKSPACE))
 
-rpp-test-sw: $(WORKSPACE)
-       $(ECLIPSE) -noSplash -data $(WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-test-sw
-       $(ECLIPSE) -noSplash -data $(WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-lib
-       $(ECLIPSE) -noSplash -data $(WORKSPACE) -application com.ti.ccstudio.apps.projectBuild -ccs.projects rpp-test-sw
+rpp-test-sw: $(TMP_WORKSPACE)
+       $(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-test-sw
+       $(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-lib
+       $(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectBuild -ccs.projects rpp-test-sw
 # Previous commands do not always return non-zero exit code on build failure - invoke make directly to not miss a potential error
        $(MAKE) -C $(CURDIR)/rpp-test-sw/Debug all
 
 clean:
-       rm -rf $(wildcard $(dir $(WORKSPACE))rpp-test-sw-workspace.*)
+       $(call rmdir,$(wildcard $(basename $(TMP_WORKSPACE)).*))
 
-$(WORKSPACE):
-       mkdir -p $(WORKSPACE)
+$(TMP_WORKSPACE):
+       $(call mkdir,$(TMP_WORKSPACE))
 
-ccs-help: $(WORKSPACE)
-       $(ECLIPSE) -noSplash -data $(WORKSPACE) -application com.ti.ccstudio.apps.projectBuild -ccs.help
+ccs-help: $(TMP_WORKSPACE)
+       $(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectBuild -ccs.help
+       $(call rmdir,$(TMP_WORKSPACE))

diff --git a/rpp-lib b/rpp-lib
index 3c69863deec2d7cb75f0a5be53db11adef8fe06a..1421295dac56f67cf6860742156598e76406851c 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 3c69863deec2d7cb75f0a5be53db11adef8fe06a
+Subproject commit 1421295dac56f67cf6860742156598e76406851c