linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	fourmess.c
This commit is contained in:
koennecke
2016-01-29 08:53:00 +01:00
parent a630a30294 5e597e2d10
commit 95988f331c
50 changed files with 183 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
make_gen
View File

@ -5,8 +5,8 @@
# Markus Zolliker March 2003
#---------------------------------------------------------------------------
EPICSOBJ=epicsmotor.o
#EPICSOBJ=
#EPICSOBJ=epicsmotor.o
EPICSOBJ=
COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ)
SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
@ -70,7 +70,7 @@ all: libmat libhlib libpsi SICServer
full: purge all
SICServer: $(OBJ) $(SUBLIBS)
g++ $(DBG) -o SICServer $(OBJ) $(LIBS)
$(CC) $(DBG) -o SICServer $(OBJ) $(LIBS)
matrix/libmatrix.a: libmat