linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TCL 8.5 and cleanup

Browse Source
This commit is contained in:
Douglas Clowes
2012-12-10 14:55:51 +11:00
parent c2150780fa
commit da1213c059
2 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
site_ansto/Makefile
View File

@ -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
$(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
@ -67,9 +74,15 @@ endif
INC_HDF5 := $(firstword $(wildcard /usr/include/hdf5.h /usr/local/include/hdf5.h))
ifeq (,$(INC_HDF5))
$(warning INC_HDF5 not found)
else
$(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
LIB_JSON := $(firstword $(wildcard /usr/lib/libjson.a /usr/lib/libjson.so /usr/local/lib/libjson.a))
@ -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}"'
@ -127,8 +142,7 @@ TANGOLIBS = \
/usr/local/lib/libomnithread.a
GHTTP_LIBS = \
$(LIB_HTTP)
GHTTP_LIBS = $(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 \
@ -152,7 +166,8 @@ OBJ= site_ansto.o anstoutil.o\
anstohttp.o \
hmcontrol_ansto.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)

2
site_ansto/hardsup/makefile
View File

@ -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