X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=ab55386da12a49d01c98f22a4f34723271e31493;hb=a2b8b2a0de173f92092bf6cbbed23551e674ca3c;hp=6ca4681a45a10f5f2e900df0e256cc4e18600ecd;hpb=3cac8340c7c822ecda3783286196c6bc4cdec66a;p=mTask.git

diff --git a/Makefile b/Makefile
index 6ca4681..ab55386 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,41 @@
 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
+
 CLMLIBS:=\
-	-I ./iTasks-SDK/Patches/Dynamics\
-	-I ./iTasks-SDK/Patches/Generics\
-	-I ./iTasks-SDK/Patches/StdEnv\
-	-I ./iTasks-SDK/Patches/TCPIP\
-	-I ./iTasks-SDK/Server\
-	-I ./clean-platform/src/libraries/OS-Independent\
-	-I ./clean-platform/src/libraries/OS-Independent/Deprecated/StdLib\
-	-I ./clean-platform/src/libraries/OS-Posix\
-	-I ./clean-platform/src/libraries/OS-Linux\
-	-I ./clean-platform/src/libraries/OS-Linux-64\
-	-I ./iTasks-SDK/Dependencies/graph_copy/linux64\
-	-I ./iTasks-SDK/Dependencies/graph_copy/common\
-	-I ./iTasks-SDK/Dependencies/SAPL\
-	-I ./iTasks-SDK/Dependencies/clean-sapl/src\
-	-I ./iTasks-SDK/Server/lib\
+	-I $(CLEAN_HOME)/lib/Platform\
+	-I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\
+	-I $(CLEAN_HOME)/lib/iTasks\
+	-I $(CLEAN_HOME)/lib/GraphCopy\
+	-I $(CLEAN_HOME)/lib/Sapl\
 	-I $(CLEAN_HOME)/lib/StdEnv\
 	-I $(CLEAN_HOME)/lib/Generics\
 	-I $(CLEAN_HOME)/lib/Dynamics\
 	-I $(CLEAN_HOME)/lib/TCPIP\
 	-I ./CleanSerial
 
-BINARIES:= mTaskExamples mTaskInterpret miTask
+BINARIES:= miTask mTaskExamples mTaskInterpret
 
-all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) int/mTaskSymbols.h
+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/ \;
 
 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 $@
 
-
 clean:
-	$(RM) -r $(BINARIES) Clean\ System\ Files miTask-data
+	$(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