From c3b3ab1f06e8b5932ceaee63146bc8dedbf0fe86 Mon Sep 17 00:00:00 2001
From: koennecke <koennecke>
Date: Wed, 23 Dec 2009 14:08:22 +0000
Subject: [PATCH] - 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
---
 linux_def             |  1 +
 makefile_linux        | 22 +++++++++++-----------
 matrix/makefile_linux |  1 -
 test/DataNumber       |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/linux_def b/linux_def
index 4feb8a3b..45815958 100644
--- a/linux_def
+++ b/linux_def
@@ -10,3 +10,4 @@
 MFLAGS=-f makefile_linux$(DUMMY)
 
 HDFROOT=/usr/local
+TCLINC=/usr/include/tcl8.3
\ No newline at end of file
diff --git a/makefile_linux b/makefile_linux
index 33944cd7..059317ff 100644
--- a/makefile_linux
+++ b/makefile_linux
@@ -1,32 +1,32 @@
 #---------------------------------------------------------------------------
 # 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
 # Markus Zolliker, March 2003
+# Mark Koennecke, December 2009
 #==========================================================================
 # assign if the National Instrument GPIB driver is available
 SINQDIR=/usr/local
-#NI=
-NI= -DHAVENI
-NIOBJ= nigpib.o
-NILIB=$(SINQDIR)/lib/cib.o
+NI=
+#NI= -DHAVENI
+#NIOBJ= nigpib.o
+#NILIB=$(SINQDIR)/lib/cib.o
 
 include linux_def
 
 CC       = gcc
-CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 -DNXXML $(NI) \
-       -Ipsi/hardsup -I. \
-       -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
+CFLAGS = -I$(HDFROOT)/include -I/usr/include/hdf -I$(TCLINC) -DHDF4 -DHDF5 \
+       -DNXXML $(NI) -Ipsi/hardsup -I.  -DCYGNUS -DNONINTF -g $(DFORTIFY)
 
 BINTARGET = bin
 EXTRA=nintf.o
 SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
 	psi/tecs/libtecsl.a
 LIBS =  -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
-       -ltcl8.4 -lmxml $(HDFROOT)/lib/libhdf5.a  \
-       $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
-        -lmxml -lghttp -ljpeg -ljson -ldl -lz -lsz  -lm  -lc 
+        -ltcl8.3  -lhdf5 -lmfhdf -ldf \
+        -lmxml -lghttp -ljpeg -ljson -ldl -lz   -lm  -lc 
 
 include make_gen
 
diff --git a/matrix/makefile_linux b/matrix/makefile_linux
index 2021c24c..ba158810 100644
--- a/matrix/makefile_linux
+++ b/matrix/makefile_linux
@@ -1,6 +1,5 @@
 #---------------------------------------------------------------------------
 # Makefile for the Matrix library
-# machine-dependent part for Redhat Linux with AFS at PSI
 #
 # Mark Koennecke, November 1996
 # Markus Zolliker, March 2003
diff --git a/test/DataNumber b/test/DataNumber
index 7c379b19..e102f056 100644
--- a/test/DataNumber
+++ b/test/DataNumber
@@ -1,3 +1,3 @@
- 287 
+ 271 
 NEVER, EVER modify or delete this file
 You'll risk eternal damnation and a reincarnation as a cockroach!|n
\ No newline at end of file