TCL 8.5 and cleanup

site_ansto/Makefile

@@ -17,7 +17,7 @@ EXTRA=nintf.o
 PSI_CLEAN_MATRIX = rm -f ../*.o ../psi/*.o; $(MAKE) -C ../matrix $(MFLAGS) clean
 PSI_CFLAGS = -I./ $(INC_HDF5) $(INC_TCL8) -DDO_NOT_SELECT_BEFORE_SEND -DHDF5 -DNXXML\
        -DCYGNUS -DNONINTF -std=gnu99 -g $(DFORTIFY)\
-	   -Wall -Wextra -Wno-unused
+       -Wall -Wextra -Wno-unused
 PSI_SLIBS = matrix/libmatrix.a
 PSI_LIBS =  \
        $(LIB_TCL8) $(LIB_HDF5) -lpthread \
@@ -42,7 +42,8 @@ INCFLAGS = -Ihardsup  -I.. $(INC_HDF5) $(INC_TCL8)
 # libraries required in descending order of preference.
 
 # TCL 8.4 or 8.5
-LIB_TCL8 := $(firstword $(wildcard /usr/lib/libtcl8.4.a /usr/lib/libtcl8.5.a /usr/lib/libtcl.so /usr/lib/libtcl8.4.so /usr/lib/libtcl8.5.so))
+LIB_TCL8 := $(firstword $(wildcard /usr/lib/libtcl8.5.a /usr/lib/libtcl8.5.so /usr/lib/libtcl8.4.a /usr/lib/libtcl8.4.so /usr/lib/libtcl.so))
+LIB_TCL8 := $(firstword $(wildcard /usr/lib/libtcl8.5.so /usr/lib/libtcl8.5.so /usr/lib/libtcl8.4.so /usr/lib/libtcl8.4.so /usr/lib/libtcl.so))
 ifeq (,$(LIB_TCL8))
   $(warning LIB_TCL8 not found)
 else
@@ -50,11 +51,17 @@ else
 # $(info LIB_TCL8 = $(LIB_TCL8))
 endif
 #
-INC_TCL8 := $(firstword $(wildcard /usr/include/tcl.h /usr/include/tcl8.4/tcl.h /usr/lib/tcl8.5/tcl.h))
+INC_TCL8 := $(firstword $(wildcard /usr/include/tcl.h /usr/include/tcl8.5/tcl.h /usr/lib/tcl8.4/tcl.h))
 ifeq (,$(INC_TCL8))
   $(warning INC_TCL8 not found)
 else
-  INC_TCL8 := -isystem $(dir $(INC_TCL8))
+  $(info "INC_TCL8 is $(dir $(INC_TCL8))")
+  ifeq ($(dir $(INC_TCL8)),"/usr/include/")
+    $(info "TCL8 in /usr/include")
+    INC_TCL8 :=
+  else
+    INC_TCL8 := -isystem $(dir $(INC_TCL8))
+  endif
 # $(info INC_TCL8 = $(INC_TCL8))
 endif
 
@@ -68,7 +75,13 @@ INC_HDF5 := $(firstword $(wildcard /usr/include/hdf5.h /usr/local/include/hdf5.h
 ifeq (,$(INC_HDF5))
   $(warning INC_HDF5 not found)
 else
-  INC_HDF5 := -I$(dir $(INC_HDF5))
+  $(info "INC_HDF5 is $(dir $(INC_HDF5))")
+  ifeq ("$(dir $(INC_HDF5))","/usr/include/")
+    $(info "HDF5 in /usr/include")
+    INC_HDF5 :=
+  else
+    INC_HDF5 := -I$(dir $(INC_HDF5))
+  endif
 endif
 
 # JSON-C
@@ -98,7 +111,9 @@ $(info Version text is "${SICS_VERSION}")
 $(info Revision text is "${SICS_REVISION}")
 #
 DEBUGFLAGS = -Wall -Wextra -Wno-unused -Wno-comment -Wno-switch
-CFLAGS = -g $(INCFLAGS) $(DEBUGFLAGS) -std=gnu99
+CFLAGS = -g -std=gnu99
+CFLAGS += $(INCFLAGS)
+CFLAGS += $(DEBUGFLAGS)
 CFLAGS += -DSICS_SITE='"${SICS_SITE}"'
 CFLAGS += -DSICS_VERSION='"${SICS_VERSION}"'
 CFLAGS += -DSICS_REVISION='"${SICS_REVISION}"'
@@ -111,24 +126,23 @@ SITEHARDSUP = hardsup/libhlib.a
 HARDSUPDIR = $(SITEDIR)/hardsup
 SUBLIBS = libansto.a hardsup/libhlib.a
 VPATH = $(SRC)
-	TANGOROOT = /usr/local/lib/
+TANGOROOT = /usr/local/lib/
-	OMNIORBROOT = /usr/local/lib
+OMNIORBROOT = /usr/local/lib
 COREDIR  = $(SRC)
 
 .SUFFIXES: 
 .SUFFIXES: .c .o .f
 
 TANGOLIBS = \
-			/usr/local/lib/libclient.a \
+    /usr/local/lib/libclient.a \
-			/usr/local/lib/liblog4tango.a \
+    /usr/local/lib/liblog4tango.a \
-			/usr/local/lib/libtango.a \
+    /usr/local/lib/libtango.a \
-			/usr/local/lib/libomniDynamic4.a \
+    /usr/local/lib/libomniDynamic4.a \
-			/usr/local/lib/libomniORB4.a \
+    /usr/local/lib/libomniORB4.a \
-			/usr/local/lib/libomnithread.a
+    /usr/local/lib/libomnithread.a
 
 
-GHTTP_LIBS = \
+GHTTP_LIBS = $(LIB_HTTP)
-			$(LIB_HTTP)
 
 #OBJ= site_ansto.o batch.o buffer.o ruli.o protocol.o sinfox.o \
 #        motor_asim.o motor_dmc2280.o motor_pdx.o \
@@ -137,22 +151,23 @@ GHTTP_LIBS = \
 
 
 OBJ= site_ansto.o anstoutil.o\
-        ansto_sctdriveadapter.o\
+    ansto_sctdriveadapter.o\
-        sctemonadapter.o\
+    sctemonadapter.o\
-        motor_asim.o motor_dmc2280.o\
+    motor_asim.o motor_dmc2280.o\
-        lh45.o lh45driv.o \
+    lh45.o lh45driv.o \
-        lakeshore340.o lakeshore340driv.o \
+    lakeshore340.o lakeshore340driv.o \
-        west4100.o west4100driv.o \
+    west4100.o west4100driv.o \
-        nhq200.o \
+    nhq200.o \
-        orhvps.o \
+    orhvps.o \
-        ls340.o \
+    ls340.o \
-        fsm.o \
+    fsm.o \
-        counterdriv.o \
+    counterdriv.o \
-        safetyplc.o \
+    safetyplc.o \
-        anstohttp.o \
+    anstohttp.o \
-        hmcontrol_ansto.o\
+    hmcontrol_ansto.o\
-        lssmonitor.o \
+    lssmonitor.o \
-        beamstopaction.o action.o
+    beamstopaction.o action.o \
+    tclClock.o tclDate.o tclUnixTime.o
 
 all: ../matrix/libmatrix.a $(COREOBJ:%=../%) $(EXTRA:%=../%) libansto.a libhardsup
 	$(CC) -g -o SICServer  $(COREOBJ:%=../%) $(EXTRA:%=../%) $(SUBLIBS) $(PSI_SLIBS:%=../%) $(PSI_LIBS) $(GHTTP_LIBS)

site_ansto/hardsup/makefile

@@ -8,7 +8,7 @@
 
 SRC    = .
 CC     = gcc
-CFLAGS = -g -DLINUX $(DFORTIFY) -I$(SRC) -I../.. $(INC_TCL8) -Wall -Wno-unused -Wextra
+CFLAGS = -g -std=gnu99 -DLINUX $(DFORTIFY) -I$(SRC) -I../.. $(INC_TCL8) -Wall -Wno-unused -Wextra
 
 HOBJ   = nhq200util.o
 HOBJ  += itc4util.o