From 98e5ce467308cab67ae9653c3f010206d7470111 Mon Sep 17 00:00:00 2001 From: Mark Lesha Date: Wed, 11 Oct 2006 14:11:13 +1000 Subject: [PATCH] MJL 11/10/06 added Histogram Server HTTP support r1132 | mle | 2006-10-11 14:11:13 +1000 (Wed, 11 Oct 2006) | 2 lines --- site_ansto/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/site_ansto/Makefile b/site_ansto/Makefile index d3fb22c6..f18962ab 100644 --- a/site_ansto/Makefile +++ b/site_ansto/Makefile @@ -30,7 +30,7 @@ PSI_LIBS = -L$(HDFROOT)/lib $(NILIB)\ # ANSTO rules and variables CC = gcc -INCFLAGS = -Ihardsup -I.. +INCFLAGS = -Ihardsup -I.. -I/opt/gnome/include CFLAGS = -g $(INCFLAGS) -Wno-unused -Wno-comment -Wno-switch -Werror HDFROOT=/usr/local @@ -57,6 +57,9 @@ TANGOLIBS = \ /usr/local/lib/libomniORB4.a \ /usr/local/lib/libomnithread.a +GHTTP_LIBS = \ + /opt/gnome/lib/libghttp.a + #OBJ= site_ansto.o batch.o buffer.o ruli.o protocol.o sinfox.o \ # motor_asim.o motor_dmc2280.o motor_pdx.o \ # itc4.o itc4driv.o \ @@ -67,10 +70,11 @@ OBJ= site_ansto.o anstoutil.o\ lh45.o lh45driv.o \ lakeshore340.o lakeshore340driv.o \ counterdriv.o\ - ../psi/tcpdocho.o ../psi/tcpdornier.o + ../psi/tcpdocho.o ../psi/tcpdornier.o \ + anstohttp.o all: ../matrix/libmatrix.a $(COREOBJ:%=../%) libansto.a libhardsup - $(CC) -g -o SICServer $(COREOBJ:%=../%) $(SUBLIBS) $(PSI_SLIBS:%=../%) $(PSI_LIBS) + $(CC) -g -o SICServer $(COREOBJ:%=../%) $(SUBLIBS) $(PSI_SLIBS:%=../%) $(PSI_LIBS) $(GHTTP_LIBS) libansto.a: $(OBJ) rm -f libansto.a