updates

[mTask.git] / Makefile

diff --git a/Makefile b/Makefile
index 49943f5..ab55386 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,20 +21,21 @@ CLMLIBS:=\
 
 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 $@
-       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
+       find . -type d -name 'Clean System Files' -print0 | xargs -r0 rm -r
        make -C CleanSerial clean