update

diff --git a/Makefile b/Makefile
index 49943f5..0beb478 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,19 +21,17 @@ 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
+       find $(CLEAN_HOME)/lib -path '*/WebPublic/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \;
 
 CleanSerial/Clean\ System\ Files/TTY.o:
        make -C CleanSerial
 
-int/mTaskSymbols.h: mTaskMakeSymbols
+client/mTaskSymbols.h: mTaskMakeSymbols
        ./$< -nr > $@
 
 %: %.icl $(wildcard *.[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

diff --git a/client/Makefile.linux b/client/Makefile.linux
index edf1195..43548ac 100644 (file)
--- a/client/Makefile.linux
+++ b/client/Makefile.linux
@@ -5,10 +5,10 @@ OBJS:=interpret.o sds.o task.o main.o interface.o
 all: mTaskSymbols.h $(PROG)
 
 interface.o: interface_linux.c
-               gcc $(CFLAGS) -c $< -o $@ 
+               $(CC) $(CFLAGS) -c $< -o $@ 
 
 $(PROG): $(OBJS)
-               gcc $(LDFLAGS) -o $@ $(OBJS)
+               $(CC) $(LDFLAGS) -o $@ $(OBJS)
                        
 mTaskSymbols.h:
                CLMFLAGS=-nr make -BC ../.. mTaskInterpret