repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
[mTask.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9f52e89
..
b81c658
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,10
+1,16
@@
CLEAN_HOME?=/opt/clean
CLM:=clm
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 $(CLEAN_HOME)/lib/Platform\
-I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\
CLMLIBS:=\
-I $(CLEAN_HOME)/lib/Platform\
-I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\
- -I
$(CLEAN_HOME)/lib/iTask
s\
+ -I
~/projects/iTasks-SDK/Librarie
s\
-I $(CLEAN_HOME)/lib/GraphCopy\
-I $(CLEAN_HOME)/lib/Sapl\
-I $(CLEAN_HOME)/lib/StdEnv\
-I $(CLEAN_HOME)/lib/GraphCopy\
-I $(CLEAN_HOME)/lib/Sapl\
-I $(CLEAN_HOME)/lib/StdEnv\
@@
-13,22
+19,23
@@
CLMLIBS:=\
-I $(CLEAN_HOME)/lib/TCPIP\
-I ./CleanSerial
-I $(CLEAN_HOME)/lib/TCPIP\
-I ./CleanSerial
-BINARIES:= m
iTask #mTaskExamples mTaskInterpret miTask
+BINARIES:= m
TaskInterpret miTask # mTaskExamples
-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 ~/projects/iTasks-SDK/Libraries -path '*/WebPublic/*' -not -path '*/CodeMirror/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \;
CleanSerial/Clean\ System\ Files/TTY.o:
make -C CleanSerial
CleanSerial/Clean\ System\ Files/TTY.o:
make -C CleanSerial
-int/mTaskSymbols.h: mTaskMakeSymbols
+client/mTaskSymbols.h: mTaskMakeSymbols
+ mkdir -p client
./$< -nr > $@
./$< -nr > $@
-%: %.icl $(wildcard *.[id]cl)
+%: %.icl $(wildcard *
/*.[id]cl *
.[id]cl)
$(CLM) $(CLMLIBS) $(CLMFLAGS) $(basename $<) -o $@
$(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
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
make -C CleanSerial clean