X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=04e4d8cf4266db123106fe812058f006df5e237e;hb=184c730e7c9ab350be853218f5e1f9b8866531ce;hp=6273d8e8a316c1332c174c747e59a21337571f64;hpb=93cabbcd5d18b7b45d6f43a6ff39f94cfcb95522;p=mTask.git

diff --git a/Makefile b/Makefile
index 6273d8e..04e4d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,38 @@
 CLEAN_HOME?=/opt/clean
 CLM:=clm
-override CLMFLAGS+=-dynamics -l -no-pie -h 200M -t -nt -lat
+
+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 $(CLEAN_HOME)/lib/iTasks-SDK/Patches/Dynamics\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Patches/Generics\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Patches/StdEnv\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Patches/TCPIP\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Server\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Posix\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Linux\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Linux-64\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/graph_copy/linux64\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/graph_copy/common\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/SAPL\
-	-I $(CLEAN_HOME)/lib/iTasks-SDK/Dependencies/clean-sapl/src\
-	-I $(CLEAN_HOME)/lib/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: $(BINARIES) int/mTaskSymbols.h
+all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) client/mTaskSymbols.h
+	#find $(CLEAN_HOME)/lib -path '*/WebPublic/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \;
 
-int/mTaskSymbols.h: mTaskMakeSymbols
+CleanSerial/Clean\ System\ Files/TTY.o:
+	make -C CleanSerial
+
+client/mTaskSymbols.h: mTaskMakeSymbols
 	./$< -nr > $@
 
 %: %.icl $(wildcard *.[id]cl)
 	$(CLM) $(CLMLIBS) $(CLMFLAGS) $(basename $<) -o $@
 
-
 clean:
-	$(RM) -r $(BINARIES) Clean\ System\ Files
+	$(RM) -r $(BINARIES) Clean\ System\ Files miTask-data miTask-www
+	make -C CleanSerial clean