Modified during MK's visit.

r1462 | ffr | 2007-02-12 12:06:19 +1100 (Mon, 12 Feb 2007) | 2 lines

site_ansto/Makefile

@@ -16,8 +16,7 @@ default: all
 EXTRA=nintf.o
 PSI_CLEAN_MATRIX = rm -f ../*.o; $(MAKE) -C ../matrix $(MFLAGS) clean
 PSI_CFLAGS = -I./ -I$(HDFROOT)/include -DHDF5 -DNXXML\
-       -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)\
-	   -I /usr/local/include/json/
+       -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
 PSI_SLIBS = matrix/libmatrix.a
 PSI_LIBS =  -L$(HDFROOT)/lib $(NILIB)\
        -ltcl8.4 $(HDFROOT)/lib/libhdf5.a  \
@@ -76,8 +75,12 @@ OBJ= site_ansto.o anstoutil.o\
         anstohttp.o \
         hmcontrol_ansto.o
 
-all: ../matrix/libmatrix.a $(COREOBJ:%=../%) libansto.a libhardsup
-	$(CC) -g -o SICServer  $(COREOBJ:%=../%) $(SUBLIBS) $(PSI_SLIBS:%=../%) $(PSI_LIBS) $(GHTTP_LIBS)
+all: ../matrix/libmatrix.a $(COREOBJ:%=../%) $(EXTRA:%=../%) libansto.a libhardsup
+	$(CC) -g -o SICServer  $(COREOBJ:%=../%) $(EXTRA:%=../%) $(SUBLIBS) $(PSI_SLIBS:%=../%) $(PSI_LIBS) $(GHTTP_LIBS)
+
+#TODO Add targets for other instruments
+echidna: all
+	make -C instrument/hrpd
 
 libansto.a: $(OBJ)
 	rm -f libansto.a