From 480d14dbe4320ed5ed149d3fbd555a39cde587c1 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Mon, 9 Oct 2006 12:50:43 +1000 Subject: [PATCH] Added nexus xml support. r1123 | ffr | 2006-10-09 12:50:43 +1000 (Mon, 09 Oct 2006) | 2 lines --- site_ansto/Makefile | 4 ++-- site_ansto/make_gen_variables | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/site_ansto/Makefile b/site_ansto/Makefile index 3aa488eb..d3fb22c6 100644 --- a/site_ansto/Makefile +++ b/site_ansto/Makefile @@ -15,12 +15,12 @@ default: all # PSI rules and variables EXTRA=nintf.o PSI_CLEAN_MATRIX = rm -f ../*.o; $(MAKE) -C ../matrix $(MFLAGS) clean -PSI_CFLAGS = -I./ -I$(HDFROOT)/include -DHDF5 \ +PSI_CFLAGS = -I./ -I$(HDFROOT)/include -DHDF5 -DNXXML\ -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) PSI_SLIBS = matrix/libmatrix.a PSI_LIBS = -L$(HDFROOT)/lib $(NILIB)\ -ltcl8.4 $(HDFROOT)/lib/libhdf5.a \ - -ldl -lz -lm -lc + -ldl -lz -lm -lc /usr/lib/libmxml.a ../%.o : ../%.c cd ..; $(CC) -c $(PSI_CFLAGS) $*.c -o $*.o diff --git a/site_ansto/make_gen_variables b/site_ansto/make_gen_variables index 801a7ace..386f94bb 100644 --- a/site_ansto/make_gen_variables +++ b/site_ansto/make_gen_variables @@ -7,7 +7,7 @@ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ devexec.o mumo.o mumoconf.o selector.o selvar.o fupa.o lld.o \ lld_blob.o strrepl.o lin2ang.o fomerge.o \ script.o o2t.o alias.o napi.o napi5.o nxdata.o stringdict.o sdynar.o \ - histmem.o histdriv.o histsim.o interface.o callback.o \ + histmem.o histdriv.o histsim.o interface.o callback.o nxio.o \ event.o emon.o evcontroller.o evdriver.o simev.o perfmon.o \ danu.o nxdict.o varlog.o stptok.o nread.o trigd.o cell.o\ scan.o fitcenter.o telnet.o token.o wwildcard.o hklmot.o\ @@ -17,14 +17,15 @@ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ simchop.o choco.o chadapter.o trim.o scaldate.o tasub.o\ hklscan.o xytable.o exebuf.o exeman.o ubfour.o ubcalc.o\ circular.o maximize.o sicscron.o scanvar.o tasublib.o\ - d_sign.o d_mod.o tcldrivable.o stdscan.o diffscan.o \ + d_sign.o d_mod.o tcldrivable.o stdscan.o diffscan.o nxxml.o \ synchronize.o definealias.o oscillate.o tasdrive.o \ hmcontrol.o userscan.o rs232controller.o lomax.o tasscanub.o \ fourlib.o motreg.o motreglist.o anticollider.o nxdataset.o \ s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) mcreader.o mccontrol.o\ hmdata.o nxscript.o tclintimpl.o sicsdata.o mcstascounter.o \ mcstashm.o initializer.o remob.o tclmotdriv.o protocol.o \ - sinfox.o sicslist.o cone.o hipadaba.o sicshipadaba.o statistics.o $(EXTRA) + sinfox.o sicslist.o cone.o hipadaba.o sicshipadaba.o statistics.o\ + $(EXTRA) MOTOROBJ = motor.o simdriv.o COUNTEROBJ = countdriv.o simcter.o counter.o