X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=1a570a56ab74fd1adf0e9e1448968982b81f43f0;hb=1e18ef692756fa4a6f163994e7edb5ad4f11b3db;hp=cbca7ae140d0193efed9b942e244b0316fb2b76a;hpb=5f4c4b61ea1e4062e90715af9e1027da6d1c7a66;p=mTask.git

diff --git a/Makefile b/Makefile
index cbca7ae..1a570a5 100644
--- 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 $(CLEAN_HOME)/lib/iTasks\
+	-I $(ITASKS)\
 	-I $(CLEAN_HOME)/lib/GraphCopy\
 	-I $(CLEAN_HOME)/lib/Sapl\
 	-I $(CLEAN_HOME)/lib/StdEnv\
@@ -19,11 +22,11 @@ CLMLIBS:=\
 	-I $(CLEAN_HOME)/lib/TCPIP\
 	-I ./CleanSerial
 
-BINARIES:= testi mTaskInterpret miTask # mTaskExamples 
+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