- Fixed a few problems with hklscan
- Added transfer of zipped data to conman.c, histogram memory software in order to support the TRICS status display. - Upgraded TRICS data file writing. - First installment of triple axis spectrometer support: initialization of data structures and an implementation of the MAD dr(ive) command.
This commit is contained in:
36
Makefile
36
Makefile
@@ -42,7 +42,9 @@ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
|
||||
sanswave.o faverage.o bruker.o rmtrail.o fowrite.o ltc11.o \
|
||||
simchop.o choco.o chadapter.o docho.o trim.o eurodriv.o scaldate.o \
|
||||
hklscan.o xytable.o amor2t.o nxamor.o amorscan.o amorstat.o \
|
||||
circular.o el755driv.o maximize.o sicscron.o tecsdriv.o sanscook.o
|
||||
circular.o el755driv.o maximize.o sicscron.o tecsdriv.o sanscook.o \
|
||||
tasinit.o tasutil.o t_rlp.o t_conv.o d_sign.o d_mod.o \
|
||||
tasdrive.o
|
||||
|
||||
MOTOROBJ = motor.o el734driv.o simdriv.o el734dc.o pipiezo.o pimotor.o
|
||||
COUNTEROBJ = countdriv.o simcter.o counter.o
|
||||
@@ -55,15 +57,15 @@ VELOOBJ = velo.o velosim.o velodorn.o velodornier.o
|
||||
#----- comment or uncomment the following according to operating system
|
||||
|
||||
#------------- for Digital Unix
|
||||
#BINTARGET=$(HOME)/bin/osf.axp
|
||||
#HDFROOT=/data/koenneck
|
||||
#CC=cc
|
||||
#EXTRA=
|
||||
#CFLAGS = -I$(HDFROOT)/include -Ihardsup -I. -std1 -g -warnprotos -c
|
||||
BINTARGET=.
|
||||
HDFROOT=/data/koenneck
|
||||
CC=cc
|
||||
EXTRA=
|
||||
CFLAGS = -I$(HDFROOT)/include -Ihardsup -I. -std1 -g -warnprotos -c
|
||||
#CFLAGS = -I$(HDFROOT)/include -DFORTIFY -Ihardsup -g -std1 -warnprotos -c
|
||||
#LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Lmatrix -lmatrix -Ltecs \
|
||||
# -ltecsl -ltcl8.0 -lfor -lmfhdf -ldf $(HDFROOT)/lib/libjpeg.a \
|
||||
# -lz -lm -ll -lc
|
||||
LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Lmatrix -lmatrix -Ltecs \
|
||||
-ltecsl -ltcl8.0 -lfor -lmfhdf -ldf $(HDFROOT)/lib/libjpeg.a \
|
||||
-lz -lm -ll -lc
|
||||
|
||||
#------- for cygnus
|
||||
#HDFROOT=../HDF411
|
||||
@@ -74,14 +76,14 @@ VELOOBJ = velo.o velosim.o velodorn.o velodornier.o
|
||||
# -lmfhdf -ldf -ljpeg -lz -lm
|
||||
|
||||
#---------- for linux
|
||||
BINTARGET=$(HOME)/bin/linux.i686
|
||||
HDFROOT=/usr/local
|
||||
CC=gcc
|
||||
CFLAGS = -I$(HDFROOT)/include -Ihardsup -fwritable-strings \
|
||||
-DCYGNUS -DNONINTF -g -c
|
||||
LIBS= -L$(HDFROOT)/lib -Lhardsup -Ltecs -ltecsl -Lmatrix -lmatrix -lhlib \
|
||||
-ltcl8.0 -lmfhdf -ldf -ljpeg -lz -lm -lg2c -ldl
|
||||
EXTRA=nintf.o
|
||||
#BINTARGET=$(HOME)/bin/linux.i686
|
||||
#HDFROOT=/usr/local
|
||||
#CC=gcc
|
||||
#CFLAGS = -I$(HDFROOT)/include -Ihardsup -fwritable-strings \
|
||||
# -DCYGNUS -DNONINTF -g -c
|
||||
#LIBS= -L$(HDFROOT)/lib -Lhardsup -Ltecs -ltecsl -Lmatrix -lmatrix -lhlib \
|
||||
# -ltcl8.0 -lmfhdf -ldf -ljpeg -lz -lm -lg2c -ldl
|
||||
#EXTRA=nintf.o
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
.c.o:
|
||||
|
||||
Reference in New Issue
Block a user