adapt to new iTasks layout

[mTask.git] / Makefile

diff --git a/Makefile b/Makefile
index 4510a04..866a77f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,12 @@
 CLEAN_HOME?=/opt/clean
 CLM:=clm
-override CLMFLAGS+=-dynamics -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 $(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\
@@ -25,7 +15,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 +29,5 @@ int/mTaskSymbols.h: mTaskMakeSymbols
 
 
 clean:
-       $(RM) -r $(BINARIES) Clean\ System\ Files
+       $(RM) -r $(BINARIES) Clean\ System\ Files miTask-data
+       make -C CleanSerial clean