From 282d30b304cd249d14a33bbbd24c93fd2bf4318d Mon Sep 17 00:00:00 2001 From: cvs Date: Fri, 20 Jun 2003 12:26:44 +0000 Subject: [PATCH] - Added makefiles for linux SKIPPED: psi/makefile_linux psi/sinqhmdriv.i psi/sinqhmdriv.w psi/swmotor.c psi/hardsup/makefile_linux psi/tecs/makefile_linux --- dummy/make_gen | 4 +++- dummy/makefile_linux_dummy | 14 ++++++++++++++ makefile_linux | 5 +++-- makefile_linux_dummy | 37 +++++++++++++++++++++++++++++++++++++ matrix/makefile_linux_dummy | 15 +++++++++++++++ 5 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dummy/makefile_linux_dummy create mode 100644 makefile_linux_dummy create mode 100644 matrix/makefile_linux_dummy diff --git a/dummy/make_gen b/dummy/make_gen index 67c39a6e..d57a7839 100644 --- a/dummy/make_gen +++ b/dummy/make_gen @@ -8,7 +8,9 @@ OBJ=dummy.o -libpsi.a: $(OBJ) +all: libdummy.a + +libdummy.a: $(OBJ) - rm libdummy.a ar cr libdummy.a $(OBJ) ranlib libdummy.a diff --git a/dummy/makefile_linux_dummy b/dummy/makefile_linux_dummy new file mode 100644 index 00000000..c745f917 --- /dev/null +++ b/dummy/makefile_linux_dummy @@ -0,0 +1,14 @@ +#--------------------------------------------------------------------------- +# Makefile for the Dummy specific part of SICS +# machine-dependent part for Tru64 Unix +# +# Mark Koennecke, June 2003 +#-------------------------------------------------------------------------- +# the following line only for fortified version +#DFORTIFY=-DFORTIFY +#========================================================================== + +CC = gcc +CFLAGS = -g $(DFORTIFY) -I.. + +include make_gen diff --git a/makefile_linux b/makefile_linux index 298c4b65..ce339df5 100644 --- a/makefile_linux +++ b/makefile_linux @@ -26,13 +26,14 @@ FORTIFYOBJ=strdup.o fortify.o MFLAGS= -f makefile_linux CC = gcc -CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I$(SRC)hardsup \ +CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -Ipsi/hardsup -I.y \ -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) BINTARGET = bin HDFROOT=/afs/psi.ch/project/sinq/linux EXTRA=nintf.o -SUBLIBS = hardsup/libhlib.a matrix/libmatrix.a tecs/libtecsl.a +SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \ + psi/tecs/libtecsl.a LIBS = -L$(HDFROOT)/lib $(SUBLIBS) \ -ltcl8.3 $(HDFROOT)/lib/libhdf5.a \ $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \ diff --git a/makefile_linux_dummy b/makefile_linux_dummy new file mode 100644 index 00000000..954a5cc1 --- /dev/null +++ b/makefile_linux_dummy @@ -0,0 +1,37 @@ +#--------------------------------------------------------------------------- +# Makefile for SICS +# machine-dependent part for Tru64 Unix +# +# Mark Koennecke 1996-2001 +# Markus Zolliker, March 2003 +#========================================================================== +# the following lines only for fortified version +#DFORTIFY=-DFORTIFY +#FORTIFYOBJ=strdup.o fortify.o +#========================================================================== +# assign if the National Instrument GPIB driver is available +#NI= -DHAVENI +#NIOBJ= nigpib.o +#NILIB=-lgpibenet +#----------------select proper Makefile +MFLAGS= -f makefile_linux_dummy + +CC = gcc +CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I. \ + -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) + +BINTARGET = bin +HDFROOT=/afs/psi.ch/project/sinq/linux +EXTRA=nintf.o +SUBLIBS = dummy/libdummy.a matrix/libmatrix.a +LIBS = -L$(HDFROOT)/lib $(SUBLIBS) \ + -ltcl8.3 $(HDFROOT)/lib/libhdf5.a \ + $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \ + $(HDFROOT)/lib/libjpeg.a -lz -lm -ll -lc + + +include make_gen_dummy + + + + diff --git a/matrix/makefile_linux_dummy b/matrix/makefile_linux_dummy new file mode 100644 index 00000000..8a3b93cf --- /dev/null +++ b/matrix/makefile_linux_dummy @@ -0,0 +1,15 @@ +#--------------------------------------------------------------------------- +# Makefile for the Matrix library +# machine-dependent part for Redhat Linux with AFS at PSI +# +# Mark Koennecke, November 1996 +# Markus Zolliker, March 2003 +#-------------------------------------------------------------------------- +# the following line only for fortified version +DFORTIFY=-DFORTIFY +#========================================================================== + +CC = gcc +CFLAGS = -g $(DFORTIFY) + +include $(SRC)make_gen