refactoors

[mTask.git] / Makefile

diff --git a/Makefile b/Makefile
index 0978187..1a570a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,13 @@ ifeq "$(GCCVERSIONGTEQ6)" "1"
        override CLMFLAGS+=-l -no-pie
 endif
 
+ITASKS:=~/projects/iTasks-SDK/Libraries
+
+#      -I ~/projects/iTasks-SDK/Libraries
 CLMLIBS:=\
        -I $(CLEAN_HOME)/lib/Platform\
        -I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\
-       -I ~/projects/iTasks-SDK/Libraries\
+       -I $(ITASKS)\
        -I $(CLEAN_HOME)/lib/GraphCopy\
        -I $(CLEAN_HOME)/lib/Sapl\
        -I $(CLEAN_HOME)/lib/StdEnv\
@@ -23,7 +26,7 @@ BINARIES:= mTaskInterpret miTask # mTaskExamples
 
 all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) #client/mTaskSymbols.h
        mkdir -p miTask-www
-       find $(CLEAN_HOME)/lib -path '*/WebPublic/*' -not -path '*/CodeMirror/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \;
+       find $(ITASKS) -path '*/WebPublic' -execdir sh -c 'cp -nvR WebPublic/* '"$$PWD"/miTask-www/ \;
 
 CleanSerial/Clean\ System\ Files/TTY.o:
        make -C CleanSerial
@@ -35,7 +38,9 @@ client/mTaskSymbols.h: mTaskMakeSymbols
 %: %.icl $(wildcard */*.[id]cl *.[id]cl)
        $(CLM) $(CLMLIBS) $(CLMFLAGS) $(basename $<) -o $@
 
-clean:
-       $(RM) -r $(BINARIES) Clean\ System\ Files miTask-data miTask-www
-       find . -type d -name 'Clean System Files' -print0 | xargs -r0 rm -r
+clean-%:
+       $(RM) -r $(addprefix $(@:clean-%=%),-data -www) $(@:clean-%=%)
+
+clean: $(addprefix clean-,$(BINARIES))
+       find . -type d -name 'Clean System Files' -print0 | xargs -r0 $(RM) -r
        make -C CleanSerial clean