From f7aad141d14f8104337a9b23a67b931abaea59d5 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Thu, 30 Oct 2014 11:24:05 +0100
Subject: [PATCH] - removed all stuff related to tecs - allow short make
 command by means of SICS_MAKE_VERSION env.variable

---
 make_gen        | 10 ++--------
 makefile        | 24 +++---------------------
 makefile_       | 25 +++++++++++++++++++++++++
 makefile_alpha  |  3 +--
 makefile_linux  |  3 +--
 makefile_macosx |  3 +--
 makefile_slinux |  2 +-
 7 files changed, 34 insertions(+), 36 deletions(-)
 create mode 100644 makefile_

diff --git a/make_gen b/make_gen
index 64962730..2572d126 100644
--- a/make_gen
+++ b/make_gen
@@ -63,7 +63,7 @@ OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA) $(EPICSOBJ)
 #--- This .SECONDARY. target is necessary to preserve generated .c files for debugging	
 .SECONDARY.: sicspoll.c polldriv.c
 
-all:	libmat libhlib libtecsl libpsi SICServer
+all:	libmat libhlib libpsi SICServer
 
 # use this target when some of the libraries SUBLIBS might be incomplete
 full:	purge all
@@ -81,12 +81,7 @@ $(SICSROOT)/sicspsi/hardsup/libhlib.a: libhlib
 libhlib:
 	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) libhlib.a
 
-$(SICSROOT)/sicspsi/tecs/libtecsl.a: libtecsl
-
-libtecsl:
-	cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) libtecsl.a
-
-$SICSROOT)/sicspsi/libpsi.a: libpsi
+$(SICSROOT)/sicspsi/libpsi.a: libpsi
 
 libpsi:
 	cd $(SICSROOT)/sicspsi; make $(MFLAGS) libpsi.a
@@ -98,7 +93,6 @@ clean:
 	rm -f *.o *.d SICServer
 	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
-	cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) clean
 	cd $(SICSROOT)/sicspsi; make $(MFLAGS) clean
 
 Dbg.o:  Dbg.c
diff --git a/makefile b/makefile
index adc02ada..34301d05 100644
--- a/makefile
+++ b/makefile
@@ -1,22 +1,4 @@
-# M. Zolliker 03.2005
+# when SICS_MAKE_VERSION is defined: use this makefile version
+# if not: show usage (see makefile_)
 
-%: usage
-	@echo
-
-%.o: usage
-	@echo
-
-default: usage
-
-usage:
-	@ echo ""
-	@ echo "Usage:"
-	@ echo ""
-	@ echo "    make -f makefile_xxx [target]"
-	@ echo ""
-	@ echo '  where makefile_xxx is one of'
-	@ echo ""
-	@ ls -1 makefile_* | pr -t -o 4
-
-
-# DO NOT DELETE
+include makefile_$(SICS_MAKE_VERSION)
diff --git a/makefile_ b/makefile_
new file mode 100644
index 00000000..2c993731
--- /dev/null
+++ b/makefile_
@@ -0,0 +1,25 @@
+# M. Zolliker 03.2005
+# this file shows the correct usage of make in the sics source directory
+
+%: usage
+	@echo
+
+%.o: usage
+	@echo
+
+default: usage
+
+usage:
+	@ echo ""
+	@ echo "Usage:"
+	@ echo ""
+	@ echo "    make -f makefile_xxx [target]"
+	@ echo ""
+	@ echo '  where makefile_xxx is one of'
+	@ echo ""
+	@ ls -1 makefile_?* | pr -t -o 4
+	@ echo ""
+	@ echo "  or use make without args:"
+	@ echo ""
+	@ echo "    setenv SICS_MAKE_VERSION slinux"
+	@ echo "    make [target]"
diff --git a/makefile_alpha b/makefile_alpha
index d85e5e0a..832ab6cb 100644
--- a/makefile_alpha
+++ b/makefile_alpha
@@ -19,8 +19,7 @@ CFLAGS = -I$(HDFROOT)/include $(DFORTIFY) -DHDF4 -DHDF5 \
 	 -g -std1 -warnprotos
 BINTARGET = bin
 EXTRA=
-SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
-        psi/tecs/libtecsl.a
+SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a
 LIBS = -L$(HDFROOT)/lib $(SUBLIBS) \
        -ltcl -lfor $(HDFROOT)/lib/libhdf5.a  \
        $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
diff --git a/makefile_linux b/makefile_linux
index 590bf7c4..f8ee79c5 100644
--- a/makefile_linux
+++ b/makefile_linux
@@ -22,8 +22,7 @@ CFLAGS = -I$(HDFROOT)/include -I/usr/include/hdf -I$(TCLINC) -DHDF4 -DHDF5 \
 
 BINTARGET = bin
 EXTRA=nintf.o
-SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
-	psi/tecs/libtecsl.a
+SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a
 LIBS =  -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
         -ltcl  -lNeXus -lhdf5 -lmfhdf -ldf \
         -lmxml -lghttp -ljpeg -ljson -ldl -lz   -lm  -lc 
diff --git a/makefile_macosx b/makefile_macosx
index 2dc98c99..6e81a4bf 100644
--- a/makefile_macosx
+++ b/makefile_macosx
@@ -22,8 +22,7 @@ CFLAGS = -I$(HDFROOT)/include -I/sw/include -DNXXML -DHDF5 -DHDF4 $(NI) -DMACOSX
 
 BINTARGET = bin
 EXTRA=nintf.o
-SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
-	psi/tecs/libtecsl.a
+SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a
 LIBS =   -L$(HDFROOT)/lib -L/sw/lib $(SUBLIBS) $(NILIB)\
        -ltcl  $(HDFROOT)/lib/libhdf5.a  -lmfhdf -ldf \
          $(HDFROOT)/lib/libsz.a \
diff --git a/makefile_slinux b/makefile_slinux
index a384635c..6be471f6 100644
--- a/makefile_slinux
+++ b/makefile_slinux
@@ -28,7 +28,7 @@ CFLAGS = -I$(HDFROOT)/include  -DNXXML  -DHDF5 $(NI) \
 BINTARGET = bin
 EXTRA=nintf.o
 SUBLIBS = $(SICSROOT)/sicspsi/libpsi.a $(SICSROOT)/sicspsi/hardsup/libhlib.a \
-	matrix/libmatrix.a $(SICSROOT)/sicspsi/tecs/libtecsl.a
+	matrix/libmatrix.a
 LIBS =    -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB) $(EPICSLIBS) \
        -ltcl -lNeXus $(HDFROOT)/lib/libhdf5.a  \
         $(HDFROOT)/lib/libsz.a \