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

makefile_slinux

@@ -9,13 +9,13 @@
 SINQDIR=/afs/psi.ch/project/sinq
 NI= -DHAVENI
 NIOBJ= nigpib.o
-NILIB=$(SINQDIR)/sl-linux/lib/cib.o
+NILIB=$(SINQDIR)/sl5/lib/cib.o
 
 include sllinux_def
 
 CC       = gcc
-CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 -DNXXML $(NI) \
-       -Ipsi/hardsup -I. \
+CFLAGS = -I$(HDFROOT)/include  -DNXXML -DHDF4 -DHDF5 $(NI) \
+       -Ipsi/hardsup  -I. \
        -Werror -DCYGNUS -DNONINTF -g $(DFORTIFY) \
        -Wall -Wno-unused -Wno-comment -Wno-switch 
 
@@ -23,10 +23,12 @@ BINTARGET = bin
 EXTRA=nintf.o
 SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
 	psi/tecs/libtecsl.a
-LIBS =  -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
-       -ltcl8.3 $(HDFROOT)/lib/libhdf5.a  \
+LIBS =   -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
+       -ltcl  $(HDFROOT)/lib/libhdf5.a  \
        $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
-       $(HDFROOT)/lib/libjpeg.a -lsz -ldl -lz -lmxml -lghttp -lm  -lc 
+       $(HDFROOT)/lib/libjpeg.a $(HDFROOT)/lib/libsz.a \
+       $(HDFROOT)/lib/libjson.a \
+       -ldl -lz -lmxml $(HDFROOT)/lib/libghttp.a -lm  -lc 
 
 include make_gen