PSI sics-cvs-psi-2008-10-02

This commit is contained in:
2012-11-15 12:39:52 +11:00
committed by Douglas Clowes
parent 6e926b813f
commit 4baffb9b7a
304 changed files with 77527 additions and 3612 deletions
+6 -6
View File
@@ -6,11 +6,11 @@
# Markus Zolliker, March 2003
#==========================================================================
# assign if the National Instrument GPIB driver is available
SINQDIR=/afs/psi.ch/project/sinq
NI=
#NI= -DHAVENI
#NIOBJ= nigpib.o
#NILIB=$(SINQDIR)/linux/lib/cib.o
SINQDIR=/usr/local
#NI=
NI= -DHAVENI
NIOBJ= nigpib.o
NILIB=$(SINQDIR)/lib/cib.o
include linux_def
@@ -26,7 +26,7 @@ SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
LIBS = -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
-ltcl8.4 -lmxml $(HDFROOT)/lib/libhdf5.a \
$(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
-ljpeg -ldl -lz -lm -lc
-lmxml -lghttp -ljpeg -ljson -ldl -lz -lsz -lm -lc
include make_gen