refactoors

[mTask.git] / Makefile

diff --git a/Makefile b/Makefile
index 0beb478..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 $(CLEAN_HOME)/lib/iTasks\
+       -I $(ITASKS)\
        -I $(CLEAN_HOME)/lib/GraphCopy\
        -I $(CLEAN_HOME)/lib/Sapl\
        -I $(CLEAN_HOME)/lib/StdEnv\
@@ -19,20 +22,25 @@ CLMLIBS:=\
        -I $(CLEAN_HOME)/lib/TCPIP\
        -I ./CleanSerial
 
-BINARIES:= miTask mTaskExamples mTaskInterpret
+BINARIES:= mTaskInterpret miTask # mTaskExamples 
 
-all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) client/mTaskSymbols.h
-       find $(CLEAN_HOME)/lib -path '*/WebPublic/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \;
+all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) #client/mTaskSymbols.h
+       mkdir -p miTask-www
+       find $(ITASKS) -path '*/WebPublic' -execdir sh -c 'cp -nvR WebPublic/* '"$$PWD"/miTask-www/ \;
 
 CleanSerial/Clean\ System\ Files/TTY.o:
        make -C CleanSerial
 
 client/mTaskSymbols.h: mTaskMakeSymbols
+       mkdir -p client
        ./$< -nr > $@
 
-%: %.icl $(wildcard *.[id]cl)
+%: %.icl $(wildcard */*.[id]cl *.[id]cl)
        $(CLM) $(CLMLIBS) $(CLMFLAGS) $(basename $<) -o $@
 
-clean:
-       $(RM) -r $(BINARIES) Clean\ System\ Files miTask-data miTask-www
+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