From 3b3d926d30743bcc051ce1bb6ab47ef95d4805b0 Mon Sep 17 00:00:00 2001 From: cvs Date: Wed, 15 Mar 2000 10:26:11 +0000 Subject: [PATCH] *** empty log message *** --- Makefile | 5 +++-- tecs/Makefile | 22 +++++++++------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 079fc778..e6fe36d5 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ # Makefile for SICS # # Mark Koennecke 1996-2000 +# Markus Zolliker March 2000: add tecs #--------------------------------------------------------------------------- BINTARGET=$(HOME)/bin/sics @@ -36,7 +37,7 @@ 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 + circular.o el755driv.o maximize.o sicscron.o tecsdriv.o MOTOROBJ = motor.o el734driv.o simdriv.o el734dc.o pipiezo.o pimotor.o COUNTEROBJ = countdriv.o simcter.o counter.o @@ -52,7 +53,7 @@ CC=cc EXTRA= CFLAGS = -I$(HDFROOT)/include -Ihardsup -std1 -g -warnprotos -c #CFLAGS = -I$(HDFROOT)/include -DFORTIFY -Ihardsup -g -std1 -warnprotos -c -LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -ltcl8.0 -lfor -lmfhdf -ldf \ +LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Ltecs -ltecsl -ltcl8.0 -lfor -lmfhdf -ldf \ $(HDFROOT)/lib/libjpeg.a -lz -lm -ll -lc #------- for cygnus diff --git a/tecs/Makefile b/tecs/Makefile index 2778b88d..d336234a 100644 --- a/tecs/Makefile +++ b/tecs/Makefile @@ -3,29 +3,25 @@ # # Markus Zolliker, March 2000 #-------------------------------------------------------------------------- -OBJ= tecc.o client.o coc.o buf.o errhdl.o util.o - -#---------- for Redhat linux -#cc= GCC -#cflags= -i/USR/LOCAL/INCLUDE -i. -i../ -dlinux -G -C +OBJ= tecc.o client.o coc.o buf.o errhdl.o util.o \ + server.o lsc.o serutil.o logfile.o dlog.o \ + asynsrv_utility.o strjoin.o geterrno.o #------------ for DigitalUnix CC=cc -CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c -#------------ for DigitalUnix with Fortify -#CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c - -#------------ for CYGNUS toolchain on Win32 -#CC=gcc -#CFLAGS= -I. -I../ -DCYGNUS -g -c +CFLAGS= -std1 -g -c -I. .c.o: $(CC) $(CFLAGS) $*.c -tecsl: $(OBJ) +tecs: $(OBJ) - rm libtecsl.a ar cr libtecsl.a $(OBJ) ranlib libtecsl.a + - rm TecsServer + cc -o TecsServer -g tecs.c -lm -L. -ltecsl + - rm tcli + cc -o tcli -g tcli.c -lm -L. -ltecsl clean: rm *.o