- Make linux makefiles work

SKIPPED:
	psi/make_gen
	psi/makefile_linux
	psi/termprot.c
	psi/hardsup/makefile_linux
	psi/tecs/pg_plus/makefile_linux
	psi/utils/makefile_linux
This commit is contained in:
koennecke
2009-12-23 14:08:22 +00:00
parent b2ecec6efe
commit c3b3ab1f06
4 changed files with 13 additions and 13 deletions

View File

@ -10,3 +10,4 @@
MFLAGS=-f makefile_linux$(DUMMY) MFLAGS=-f makefile_linux$(DUMMY)
HDFROOT=/usr/local HDFROOT=/usr/local
TCLINC=/usr/include/tcl8.3

View File

@ -1,32 +1,32 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Makefile for SICS # Makefile for SICS
# machine-dependent part for Redhat Linux with AFS at PSI # This one is to use when all additional libraries have been
# installed under /usr/local
# #
# Mark Koennecke 1996-2001 # Mark Koennecke 1996-2001
# Markus Zolliker, March 2003 # Markus Zolliker, March 2003
# Mark Koennecke, December 2009
#========================================================================== #==========================================================================
# assign if the National Instrument GPIB driver is available # assign if the National Instrument GPIB driver is available
SINQDIR=/usr/local SINQDIR=/usr/local
#NI= NI=
NI= -DHAVENI #NI= -DHAVENI
NIOBJ= nigpib.o #NIOBJ= nigpib.o
NILIB=$(SINQDIR)/lib/cib.o #NILIB=$(SINQDIR)/lib/cib.o
include linux_def include linux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 -DNXXML $(NI) \ CFLAGS = -I$(HDFROOT)/include -I/usr/include/hdf -I$(TCLINC) -DHDF4 -DHDF5 \
-Ipsi/hardsup -I. \ -DNXXML $(NI) -Ipsi/hardsup -I. -DCYGNUS -DNONINTF -g $(DFORTIFY)
-fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
BINTARGET = bin BINTARGET = bin
EXTRA=nintf.o EXTRA=nintf.o
SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \ SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
psi/tecs/libtecsl.a psi/tecs/libtecsl.a
LIBS = -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\ LIBS = -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
-ltcl8.4 -lmxml $(HDFROOT)/lib/libhdf5.a \ -ltcl8.3 -lhdf5 -lmfhdf -ldf \
$(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \ -lmxml -lghttp -ljpeg -ljson -ldl -lz -lm -lc
-lmxml -lghttp -ljpeg -ljson -ldl -lz -lsz -lm -lc
include make_gen include make_gen

View File

@ -1,6 +1,5 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Makefile for the Matrix library # Makefile for the Matrix library
# machine-dependent part for Redhat Linux with AFS at PSI
# #
# Mark Koennecke, November 1996 # Mark Koennecke, November 1996
# Markus Zolliker, March 2003 # Markus Zolliker, March 2003

View File

@ -1,3 +1,3 @@
287 271
NEVER, EVER modify or delete this file NEVER, EVER modify or delete this file
You'll risk eternal damnation and a reincarnation as a cockroach!|n You'll risk eternal damnation and a reincarnation as a cockroach!|n