Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics

This commit is contained in:
2015-03-17 11:45:06 +01:00
8 changed files with 38 additions and 40 deletions

View File

@@ -63,7 +63,7 @@ OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA) $(EPICSOBJ)
#--- This .SECONDARY. target is necessary to preserve generated .c files for debugging
.SECONDARY.: sicspoll.c polldriv.c
all: libmat libhlib libtecsl libpsi SICServer
all: libmat libhlib libpsi SICServer
# use this target when some of the libraries SUBLIBS might be incomplete
full: purge all
@@ -81,12 +81,7 @@ $(SICSROOT)/sicspsi/hardsup/libhlib.a: libhlib
libhlib:
cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) libhlib.a
$(SICSROOT)/sicspsi/tecs/libtecsl.a: libtecsl
libtecsl:
cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) libtecsl.a
$SICSROOT)/sicspsi/libpsi.a: libpsi
$(SICSROOT)/sicspsi/libpsi.a: libpsi
libpsi:
cd $(SICSROOT)/sicspsi; make $(MFLAGS) libpsi.a
@@ -98,7 +93,6 @@ clean:
rm -f *.o *.d SICServer
cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) clean
cd matrix; make $(MFLAGS) clean
cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) clean
cd $(SICSROOT)/sicspsi; make $(MFLAGS) clean
Dbg.o: Dbg.c