PSI sics-cvs-psi-2006

makefile_linux

@@ -6,32 +6,29 @@
 # 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
 
-# The variable SRC is needed for the case, where source and objects are
-# separated. In the case where objects are mixed up with sources, SRC
-# is assumed to be empty and does not harm. I case of problems
-# please ask Markus Zolliker.
-
-include $(SRC)linux_def
+include linux_def
 
 CC       = gcc
-CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \
-       -I$(SRC)psi/hardsup -I$(SRC). \
+CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 -DNXXML $(NI) \
+       -Ipsi/hardsup -I. \
        -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
 
 BINTARGET = bin
 EXTRA=nintf.o
 SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
 	psi/tecs/libtecsl.a
-LIBS = -static -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
-       -ltcl8.3 $(HDFROOT)/lib/libhdf5.a  \
+LIBS =  -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
+       -ltcl8.4 -lmxml $(HDFROOT)/lib/libhdf5.a  \
        $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
-       $(HDFROOT)/lib/libjpeg.a -ldl -lz  -lm  -lc 
+       -ljpeg -ldl -lz  -lm  -lc 
 
-include $(SRC)make_gen
+include make_gen