M.Z.

tecs/cd_obj

@@ -0,0 +1 @@
+cd ../../obj/$SICS_VERSION/psi/tecs

tecs/make_gen

@@ -5,7 +5,11 @@
 # Markus Zolliker, March 2003
 #--------------------------------------------------------------------------
 
-VPATH=$(SRC)
+.SUFFIXES:
+.SUFFIXES: .o .c .f
+
+VPATH=$(SRC):$(ROOT)/$(SRC)
+ROOT=../..
 
 LIBR_OBJ  =coc_util.o myc_err.o myc_str.o myc_buf.o myc_time.o
 SERV_OBJ  =tecs.o coc_server.o tecs_lsc.o tecs_serial.o coc_logfile.o \
@@ -18,6 +22,8 @@ TCLI_OBJ  =sys_getenv.o sys_env.o myc_tmp.o sys_cmdpar.o \
 TECLI_OBJ =tecs_client.o tecs_plot.o str.o instr_hosts.o \
            $(TCLI_OBJ)
 
+HARDSUPLIB = ../hardsup/libhlib.a
+
 #.f.o:
 #	$(FC) $(FFLAGS) -c $F
 #
@@ -34,32 +40,35 @@ all: libtecsl.a TecsServer TecsClient keep_running six
 test: tecs_cli.c
 	echo $(VPATH) $C
 
-TecsServer: $(SERV_OBJ) $(HARDSUPLIB)
-	$(CC) $(CFLAGS) -o $@ $Q -lm $(FORTIFYOBJ)
+TecsServer: $(SERV_OBJ) $(HARDSUPLIB) $(FORTIFYOBJ)
+	$(CC) $(CFLAGS) -o $@ $Q -lm
 
-TecsClient: $(TECLI_OBJ)
-	$(FC) -o $@ $Q $(PGLIB) $(RDLIB) $(FORTIFYOBJ)
+TecsClient: $(TECLI_OBJ) $(FORTIFYOBJ)
+	$(FC) -o $@ $Q $(PGLIB) $(RDLIB)
+
+$(HARDSUPLIB):
+	cd ../hardsup; make $(MFLAGS) libhlib.a
 
 # -- for tascom --
-libtecs.so: tecs_c.c $(CLI_OBJ)
-	$(CC) $(CFLAGS) -shared -o $@ $Q $(FORTIFYOBJ)
+libtecs.so: tecs_c.c $(CLI_OBJ) $(FORTIFYOBJ)
+	$(CC) $(CFLAGS) -shared -o $@ $Q
 
 # -- for Tru64 Unix only
 conv: strings.f90 conv.f90 sys_cmdpar.o str.o
 	f90 -o conv $Q
 
-config: src/tecs src/tecs/tecs.cfg
+config: tecs tecs/tecs.cfg
 
-src/tecs: conv src/cfg/*.inp
-	conv all
-	touch src/tecs
+tecs: conv src/cfg/*.inp
+	./conv all
+	touch tecs
 
-src/tecs/tecs.cfg: src/cfg/*.cfg
-	cp src/cfg/*.cfg src/tecs/
+tecs/tecs.cfg: src/cfg/*.cfg
+	cp src/cfg/*.cfg tecs/
 
 # -- needs special include
 tecs_serial.o: tecs_serial.c
-	$(CC) $(CFLAGS) -I$(SICS)/hardsup -c $Q
+	$(CC) $(CFLAGS) -I$(ROOT)/psi/hardsup/$(SRC) -c $Q
 
 keep_running: keep_running.c
 	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
@@ -67,8 +76,9 @@ keep_running: keep_running.c
 six: six.c term.o sys_select.o libtecsl.a
 	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
 
-#rstart: rstart.c myc_str.o myc_err.o instr_hosts.o
-#	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
+rexstart: rstart.c myc_str.o myc_err.o instr_hosts.o
+	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
+	@ echo "$(PWD)/rstart"
 #
 #serverd: serverd.c myc_str.o myc_err.o coc_util.o myc_buf.o
 #	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)

tecs/makefile_alpha

@@ -7,11 +7,9 @@
 
 include ../../alpha_def
 
-SICS=src/..
-
 CC       = cc
 FC       = f77
-CFLAGS   = -std1 -g -warnprotos $(DFORITFY)
+CFLAGS   = -std1 -g -warnprotos $(DFORTIFY)
 FFLAGS   = -u -g
 ARFLAGS  = cr
 
@@ -21,9 +19,6 @@ SYS_OPEN = _alpha
 # -- PGPLOT library
 PGLIB    =$(PGPLOT_DIR)/libpgplot.a -L/usr/X11R6/lib -lX11
 
-# -- library for ASYNSRV
-HARDSUPLIB=../hardsup/libhlib.a
-
 # -- readline library
 RDLIB    =-lreadline -ltermcap
 

tecs/makefile_linux

@@ -9,7 +9,7 @@ include ../../$(SRC)linux_def
 
 CC       = gcc
 FC       = g77
-CFLAGS   = -DLINUX -g $(DFORTIFY) -I../$(SRC) -I../hardsup/$(SRC)
+CFLAGS   = -DLINUX -g $(DFORTIFY)
 FFLAGS   = -u -fvxt -g
 ARFLAGS  = cr
 
@@ -20,9 +20,6 @@ ARFLAGS  = cr
 PGPLOT   =/afs/psi.ch/user/z/zolliker/pgplot/
 PGLIB    =$(PGPLOT)/libpgplot.a -L/usr/X11R6/lib -lX11
 
-# -- library for ASYNSRV
-HARDSUPLIB=../hardsup/libhlib.a
-
 # -- readline library
 RDLIB    =-lreadline -ltermcap