better gcc req

cmt/requirements-gcc

@@ -13,14 +13,14 @@ macro_append cpplinkflags  " -fopenmp "
 
 
 #CAMEL includes
-include_dirs " ../src"
-include_dirs "../src/camel"
-include_dirs "../src/Minuit2-5.28.00/src"
-include_dirs "../src/Minuit2-5.28.00/inc"
-include_dirs  "../src/cxxsupport"
-include_dirs  "../src/AbsRand"
-include_dirs  "../src/camel/JLA"
-include_dirs  "../src/camel/JLA/jla_likelihood_v3/src"
+include_dirs " $(CAMELROOT)/src"
+include_dirs " $(CAMELROOT)/src/camel"
+include_dirs " $(CAMELROOT)/src/Minuit2-5.28.00/src"
+include_dirs " $(CAMELROOT)/src/Minuit2-5.28.00/inc"
+include_dirs  "$(CAMELROOT)/src/cxxsupport"
+include_dirs  "$(CAMELROOT)/src/AbsRand"
+include_dirs  "$(CAMELROOT)/src/camel/JLA"
+include_dirs  "$(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src"
 
 
 #cfitsio
@@ -32,7 +32,7 @@ macro_append  CAMEL_linkopts " -lcfitsio"
 #macro_append cppflags ' -DJLA '
 #include_dirs  "/usr/include/atlas"
 #macro_append  CAMEL_linkopts " -L/usr/lib64/atlas -lcblas -llapack -ljla "
-#application test_jla -group=test -s=../src/camel test/test_jla.cc
+#application test_jla -group=test -s=$(CAMELROOT)/src/camel test/test_jla.cc
 
 
 #PLANCK
@@ -46,8 +46,8 @@ macro_append  CAMEL_linkopts " -lcfitsio"
 #macro_append cflags " -DCLIK "
 #macro_append  CAMEL_linkopts "-L$(CLIKDIR)/lib -lclik "
 #path_append LD_LIBRARY_PATH "$(CLIKDIR)/lib"
-#application dump_clik -group=test -s=../src/camel test/test_clik.cc
-#application dump_lensing -group=test -s=../src/camel test/test_lensing.cc
+#application dump_clik -group=test -s=$(CAMELROOT)/src/camel test/test_clik.cc
+#application dump_lensing -group=test -s=$(CAMELROOT)/src/camel test/test_lensing.cc
 
 
 # PICO 
@@ -57,44 +57,44 @@ macro_append  CAMEL_linkopts " -lcfitsio"
 # (set in camel_setup.sh)
 #macro_append CAMEL_linkopts " $(PICOLIBS)"
 #macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
-#application testPico -group=test -s=../src/camel/pico/exec testPico.cc
+#application testPico -group=test -s=$(CAMELROOT)/src/camel/pico/exec testPico.cc
 
 ###FROM THERE YOU DONT NEED TO TOUCH
 ###########################################################################################
 #CAMEL LIBRARIES
-library Minuit -no_share ../src/Minuit2-5.28.00/src/*.cxx
-library Util -no_share -x=ddl.cc ../src/cxxsupport/*.cc
-library AbsRand -no_share ../src/AbsRand/*.cc
-library CLHEP -no_share ../src/CLHEP/src/*.cc
-library jla  -no_share ../src/camel/JLA/jla_likelihood_v3/src/ini.c ../src/camel/JLA/jla_likelihood_v3/src/jla.cc
+library Minuit -no_share $(CAMELROOT)/src/Minuit2-5.28.00/src/*.cxx
+library Util -no_share -x=ddl.cc $(CAMELROOT)/src/cxxsupport/*.cc
+library AbsRand -no_share $(CAMELROOT)/src/AbsRand/*.cc
+library CLHEP -no_share $(CAMELROOT)/src/CLHEP/src/*.cc
+library jla  -no_share $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/ini.c $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/jla.cc
 
 macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
-library MinuitFit  -no_share -s=../src/camel $(camelsrc)
-library MCMC  -no_share  -s=../src/camel/MCMC *.cc
+library MinuitFit  -no_share -s=$(CAMELROOT)/src/camel $(camelsrc)
+library MCMC  -no_share  -s=$(CAMELROOT)/src/camel/MCMC *.cc
 
-macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
+macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
 macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
 
 
 #CAMEL applications
 # pour relinker si changement: toutes les application du package
-macro CAMEL_stamps " $(PACKAGE_ROOT)/$(CMTCONFIG)/MinuitFit.stamp $(PACKAGE_ROOT)/$(CMTCONFIG)/MCMC.stamp "
+macro CAMEL_stamps " $(CAMELROOT)/$(CMTCONFIG)/MinuitFit.stamp $(CAMELROOT)/$(CMTCONFIG)/MCMC.stamp "
 macro application_suffix ""
 
 #groupe exec
-application writeChi2 -group=exec -s=../src/camel exec/writeChi2.cc
-application writeSpectra -group=exec -s=../src/camel exec/writeSpectra.cc
-application writeSpectraPk -group=exec -s=../src/camel exec/writeSpectraPk.cc
-application Minimize -group=exec -s=../src/camel exec/Minimize.cc
-application Profile -group=exec -s=../src/camel exec/Profile.cc
-application ScanParam -group=exec -s=../src/camel exec/ScanParam.cc
-application mcmc -group=exec -s=../src/camel/MCMC exec/mainMCMC.cc
+application writeChi2 -group=exec -s=$(CAMELROOT)/src/camel exec/writeChi2.cc
+application writeSpectra -group=exec -s=$(CAMELROOT)/src/camel exec/writeSpectra.cc
+application writeSpectraPk -group=exec -s=$(CAMELROOT)/src/camel exec/writeSpectraPk.cc
+application Minimize -group=exec -s=$(CAMELROOT)/src/camel exec/Minimize.cc
+application Profile -group=exec -s=$(CAMELROOT)/src/camel exec/Profile.cc
+application ScanParam -group=exec -s=$(CAMELROOT)/src/camel exec/ScanParam.cc
+application mcmc -group=exec -s=$(CAMELROOT)/src/camel/MCMC exec/mainMCMC.cc
 
 #tests
-application testKlass -group=test -s=../src/camel test/testKlass.cc
-application testCLHEP -group=test -s=../src/camel/test testCLHEP.cc
-application testBAO -group=test -s=../src/camel/test testBAO.cc
-application testHiLLiPOP -group=test -s=../src/camel/test testHiLLiPOP.cc
+application testKlass -group=test -s=$(CAMELROOT)/src/camel test/testKlass.cc
+application testCLHEP -group=test -s=$(CAMELROOT)/src/camel/test testCLHEP.cc
+application testBAO -group=test -s=$(CAMELROOT)/src/camel/test testBAO.cc
+application testHiLLiPOP -group=test -s=$(CAMELROOT)/src/camel/test testHiLLiPOP.cc
 
 #lIST OF ALL DEPENDENCIES
 macro_append Minimize_dependencies " MinuitFit "
@@ -113,5 +113,4 @@ macro_append testCLHEP_dependencies " CLHEP "
 macro_append testBAO_dependencies " MinuitFit "
 macro_append testHiLLiPOP_dependencies " MinuitFit "
 macro_append test_jla_dependencies " MinuitFit "
-macro_append testPico_dependencies " MinuitFit "