From f1c105085dfc8d577b8035a75f3b61adb4c5c4af Mon Sep 17 00:00:00 2001
From: Mark Koennecke <mark.koennecke@psi.ch>
Date: Mon, 24 Feb 2014 08:42:19 +0100
Subject: [PATCH] Made SICS compile in the new git setup

---
 .gitignore      | 121 ++++++++++++++++++++++++++++++++++++++++++++++++
 frame.c         |   4 +-
 make_gen        |  18 +++----
 makefile_slinux |  13 ++----
 4 files changed, 136 insertions(+), 20 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2eed84ba
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,121 @@
+# Took these from the https://github.com/github/gitignore project on October 21, 2011
+
+# **** 'Personal' entries don't belong in here - put them in your .git/info/exclude file ****
+
+# Ignore text editor (e.g. emacs) autosave files
+*~
+
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+*.d
+SICServer
+
+# Compiled Dynamic libraries
+*.so
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# Compiled python files
+*.py[co]
+
+# Eclipse-generated files
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+*.sln
+*.vcproj
+*.exe
+*.vcxproj
+*.filters
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+*.sdf
+
+#Test results
+*.log
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+
+
+# Others
+*.autosave
+
+
+# Windows image file caches
+Thumbs.db
+
+
+# Mac OS X Finder
+.DS_Store
+
diff --git a/frame.c b/frame.c
index db384389..09e06ea1 100644
--- a/frame.c
+++ b/frame.c
@@ -19,8 +19,8 @@
 #include "HistMem.h"
 #include "HistMem.i"
 #include "HistDriv.i"
-#include "psi/hardsup/sinqhm.h"
-#include "psi/sinqhmdriv.i"
+#include "sicspsi/hardsup/sinqhm.h"
+#include "sicspsi/sinqhmdriv.i"
 #include "nxdict.h"
 #include "frame.h"
 
diff --git a/make_gen b/make_gen
index cf100558..8f0e4581 100644
--- a/make_gen
+++ b/make_gen
@@ -76,30 +76,30 @@ matrix/libmatrix.a: libmat
 libmat:
 	cd matrix; make $(MFLAGS) libmatrix.a
 
-psi/hardsup/libhlib.a: libhlib
+$(SICSROOT)/sicspsi/hardsup/libhlib.a: libhlib
 
 libhlib:
-	cd psi/hardsup; make $(MFLAGS) libhlib.a
+	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) libhlib.a
 
-psi/tecs/libtecsl.a: libtecsl
+$(SICSROOT)/sicspsi/tecs/libtecsl.a: libtecsl
 
 libtecsl:
-	cd psi/tecs; make $(MFLAGS) libtecsl.a
+	cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) libtecsl.a
 
-psi/libpsi.a: libpsi
+$SICSROOT)/sicspsi/libpsi.a: libpsi
 
 libpsi:
-	cd psi; make $(MFLAGS) libpsi.a
+	cd $(SICSROOT)/sicspsi; make $(MFLAGS) libpsi.a
 
 purge:
 	rm -f SICServer $(SUBLIBS)
 
 clean:
 	rm -f *.o *.d SICServer
-	cd psi/hardsup; make $(MFLAGS) clean
+	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
-	cd psi/tecs; make $(MFLAGS) clean
-	cd psi; make $(MFLAGS) clean
+	cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) clean
+	cd $(SICSROOT)/sicspsi; make $(MFLAGS) clean
 
 Dbg.o:  Dbg.c
 	cc -g  -I/data/koenneck/include -c Dbg.c
diff --git a/makefile_slinux b/makefile_slinux
index eca1ed3d..09e3af71 100644
--- a/makefile_slinux
+++ b/makefile_slinux
@@ -4,6 +4,7 @@
 #
 # Mark Koennecke 1996-2001
 # Markus Zolliker, March 2003
+# Mark Koennecke, February 2014
 #==========================================================================
 # assign if the National Instrument GPIB driver is available
 SINQDIR=/afs/psi.ch/project/sinq
@@ -17,14 +18,14 @@ include sllinux_def
 
 CC       = gcc
 CFLAGS = -I$(HDFROOT)/include  -DNXXML  -DHDF5 $(NI) \
-       -Ipsi/hardsup  -I.  -MMD \
+       -I$(SICSROOT)/sicspsi/hardsup -I$(SICSROOT) -I.  -MMD \
        -Werror -DCYGNUS -DNONINTF $(DBG) $(DFORTIFY) \
        -Wall -Wno-unused -Wunused-value -Wno-comment -Wno-switch 
 
 BINTARGET = bin
 EXTRA=nintf.o
-SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
-	psi/tecs/libtecsl.a
+SUBLIBS = $(SICSROOT)/sicspsi/libpsi.a $(SICSROOT)/sicspsi/hardsup/libhlib.a \
+	matrix/libmatrix.a $(SICSROOT)/sicspsi/tecs/libtecsl.a
 LIBS =    -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB) $(EPICSLIBS) \
        -ltcl -lNeXus $(HDFROOT)/lib/libhdf5.a  \
         $(HDFROOT)/lib/libsz.a \
@@ -35,9 +36,3 @@ include make_gen
 
 -include $(OBJ:.o=.d)
 
-
-
-
-
-
-