X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=6ca4681a45a10f5f2e900df0e256cc4e18600ecd;hb=8449be73c124cdccd37500c0d67d9404b94fc9c8;hp=3956c1d622f87d727f56ffab32c1fe351f864f35;hpb=4dff4046c87727f8b09558969f7c655b9e4de3c1;p=mTask.git

diff --git a/Makefile b/Makefile
index 3956c1d..6ca4681 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 CLEAN_HOME?=/opt/clean
 CLM:=clm
-override CLMFLAGS+=-dynamics -l -no-pie -h 200M -nt
+override CLMFLAGS+=-dynamics -h 200M -nt -l -no-pie
 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 ./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/StdEnv\
 	-I $(CLEAN_HOME)/lib/Generics\
 	-I $(CLEAN_HOME)/lib/Dynamics\
@@ -25,7 +25,11 @@ CLMLIBS:=\
 
 BINARIES:= mTaskExamples mTaskInterpret miTask
 
-all: $(BINARIES) int/mTaskSymbols.h
+all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) int/mTaskSymbols.h
+
+CleanSerial/Clean\ System\ Files/TTY.o:
+	make -C CleanSerial
+
 
 int/mTaskSymbols.h: mTaskMakeSymbols
 	./$< -nr > $@
@@ -35,4 +39,5 @@ int/mTaskSymbols.h: mTaskMakeSymbols
 
 
 clean:
-	$(RM) -r $(BINARIES) Clean\ System\ Files
+	$(RM) -r $(BINARIES) Clean\ System\ Files miTask-data
+	make -C CleanSerial clean