From cabd3a98ffc95e7857d7a0565696f7a1879946aa Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Tue, 5 Oct 2010 11:44:58 +0000
Subject: [PATCH] *** empty log message ***

---
 tracy/tools/Makefile.am | 58 +++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/tracy/tools/Makefile.am b/tracy/tools/Makefile.am
index 6323b5f..6ba66a7 100644
--- a/tracy/tools/Makefile.am
+++ b/tracy/tools/Makefile.am
@@ -3,46 +3,36 @@
 #bin_PROGRAMS      = max4 
 #bin_PROGRAMS      = soltracy 
 bin_PROGRAMS      = testtracy
+#bin_PROGRAMS      = soltracy testtracy 
 #bin_PROGRAMS      = max4 track_fft dynap leac
 
 #max4_SOURCES      = max4.cc nrutil.c nrcheck.c nrlinwww.c   nrframe.c
+# Normal
 #soltracy_SOURCES  = soltracy.cc nrutil.c nrcheck.c nrlinwww.c   nrframe.c
-testtracy_SOURCES = testtracy.cc nrutil.c nrcheck.c nrlinwww.c   nrframe.c
-
-#LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy -L$(NUM_REC)/lib -lnum_rec \
-#	    -L/usr/lib/gcc-lib/i586-mandriva-linux-gnu/3.3.6 -lstdc++ -lg2c
-#	    -L/usr/lib/gcc/i586-mandriva-linux-gnu/4.1.1 -lstdc++ 
-#INCLUDES = -I$(TRACY_LIB)/tracy/inc -I$(NUM_REC)/inc \
-#	    -I/usr/include/c++/3.3.6
-#CXXFLAGS = -g -O2 -Wall -Wno-non-template-friend
-
-
-
-# these work with Johan's local build of tracy-3.5
-#LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy -L$(NUM_REC)/lib -lnum_rec \
-#	   -L/home/johan/my_gcc/lib/gcc/i686-pc-linux-gnu/3.4.6 -lstdc++ -lg2c
-#INCLUDES = -I$(TRACY_LIB)/tracy/inc -I$(NUM_REC)/inc \
-#	   -I/home/johan/my_gcc/include/c++/3.4.6
-# and for ORDER > 1
-#LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy_ptc -lTPSALib -lLieLib \
-#           -L$(NUM_REC)/lib -lnum_rec \
-#           -L/home/johan/my_gcc/lig/gcc/i686-pc-linux-gnu/3.4.6 -lstdc++ -lg2c
-#INCLUDES = -I$(TRACY_LIB)/tracy/inc -I$(NUM_REC)/inc \
-#           -I/home/johan/my_gcc/include/c++/3.4.6
-
-# these work with AccPhysSim's regular build of tracy-3.5
-#LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy -L$(NUM_REC)/lib -lnum_rec \
-#	   -L/usr/lib/gcc/i386-redhat-linux/3.4.6 -lstdc++ -lg2c
-#INCLUDES = -I$(TRACY_LIB)/tracy/inc -I$(NUM_REC)/inc \
-#	   -I/usr/include/c++/3.4.6
-
+# With no library
+soltracy_SOURCES  = soltracy.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c ../tracy/src/tracy_lib.cc
+testtracy_SOURCES = testtracy.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c ../tracy/src/tracy_lib.cc
 
 # these work with tracy-3.5-20090922
-LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy -L$(NUM_REC)/lib -lnum_rec \
-	   -lstdc++ \
-           -L/usr/lib/gcc/i386-redhat-linux/4.1.1 -lgfortran
+# HYPERION
+#LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy -L$(NUM_REC)/lib -lnum_rec \
+#	   -lstdc++ \
+#           -L/usr/lib/gcc/i386-redhat-linux/4.1.1 -lgfortran
+# Modif for Library directory in src instead of lib for easing the compilation
+# otherwise issue with compiling and installing the library, has to by done by hand.
+
+# MAC
+# with Library
+#LIBS     = -L$(TRACY_LIB)/tracy/src -ltracy -L$(NUM_REC)/lib -lrecipes_c_gcc \
+#	   -lstdc++ -L$(LIBPATH) -lgfortran
+LIBS     = -L$(NUM_REC)/lib -lrecipes_c_gcc \
+	   -lstdc++ -lgfortran
 INCLUDES = -I$(TRACY_LIB)/tracy/inc -I$(NUM_REC)/inc
 
-FFLAGS   = -g -O2 -Wall -fbounds-check
-CXXFLAGS = -g -O2 -Wall -fno-implicit-templates
+# METIS MAC
+FFLAGS   = -g -O2  -Wall -fbounds-check
+CXXFLAGS = -g -O2  -Wall -fno-implicit-templates
 
+#ISEI
+#FFLAGS   = -O2 -Wall -fbounds-check
+#CXXFLAGS = -O2 -Wall -fno-implicit-templates
-- 
GitLab