X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=f8054daadeb7b1b2019298f5276de34b56bcd861;hb=a81623aa9629a3c5c8f8bf920e494a596b30c4b7;hp=9f52e893042f29c054372797ae81a5f4eb3eab3e;hpb=077ade5d137ad163b059f7212e3c350b17290bad;p=mTask.git

diff --git a/Makefile b/Makefile
index 9f52e89..f8054da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
 CLEAN_HOME?=/opt/clean
 CLM:=clm
-override CLMFLAGS+=-dynamics -h 200M -nt -l -no-pie
+
+override CLMFLAGS+=-dynamics -h 200M -nt
+GCCVERSIONGTEQ6:=$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6)
+ifeq "$(GCCVERSIONGTEQ6)" "1"
+	override CLMFLAGS+=-l -no-pie
+endif
+
+#	-I ~/projects/iTasks-SDK/Libraries
 CLMLIBS:=\
 	-I $(CLEAN_HOME)/lib/Platform\
 	-I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\
-	-I $(CLEAN_HOME)/lib/iTasks\
+	-I ~/projects/iTasks-SDK/Libraries\
 	-I $(CLEAN_HOME)/lib/GraphCopy\
 	-I $(CLEAN_HOME)/lib/Sapl\
 	-I $(CLEAN_HOME)/lib/StdEnv\
@@ -13,22 +20,22 @@ CLMLIBS:=\
 	-I $(CLEAN_HOME)/lib/TCPIP\
 	-I ./CleanSerial
 
-BINARIES:= miTask #mTaskExamples mTaskInterpret miTask
-
-all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) int/mTaskSymbols.h
+BINARIES:= mTaskInterpret miTask # mTaskExamples 
 
+all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) #client/mTaskSymbols.h
+	mkdir -p miTask-www
+	find ~/projects/iTasks-SDK/Libraries -path '*/WebPublic' -execdir sh -c 'cp -nvR WebPublic/* '"$$PWD"/miTask-www/ \;
 CleanSerial/Clean\ System\ Files/TTY.o:
 	make -C CleanSerial
 
-int/mTaskSymbols.h: mTaskMakeSymbols
+client/mTaskSymbols.h: mTaskMakeSymbols
+	mkdir -p client
 	./$< -nr > $@
 
-%: %.icl $(wildcard *.[id]cl)
+%: %.icl $(wildcard */*.[id]cl *.[id]cl)
 	$(CLM) $(CLMLIBS) $(CLMFLAGS) $(basename $<) -o $@
-	mkdir -p $(basename $<)-www
-	find $(CLEAN_HOME)/lib -path '*/WebPublic/*' -execdir \
-		cp -nR {} "$$PWD"/$(basename $<)-www/ \;
 
 clean:
 	$(RM) -r $(BINARIES) Clean\ System\ Files miTask-data miTask-www
+	find . -type d -name 'Clean System Files' -print0 | xargs -r0 rm -r
 	make -C CleanSerial clean