From 36ca867c2cb36971d778c716d5615b2ddbb5c8f0 Mon Sep 17 00:00:00 2001
From: Baptiste LENIAU <baptiste.leniau@subatech.in2p3.fr>
Date: Wed, 16 Sep 2015 16:57:46 +0000
Subject: [PATCH] Changing the install method of CLASS : make it much more 
 simpler for the user. TO INSTALL CLASS FOR THE FIRST TIME YOU HAVE TO RUN
 CLASS_PATH/Utils/install.sh in the CLASS_PATH folder

git-svn-id: svn+ssh://svn.in2p3.fr/class@765 0e7d625b-0364-4367-a6be-d5be4a48d228
---
 gui/trunk/Makefile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gui/trunk/Makefile b/gui/trunk/Makefile
index a9155c5ac..e8281a6f6 100755
--- a/gui/trunk/Makefile
+++ b/gui/trunk/Makefile
@@ -1,12 +1,10 @@
-include ./Makefile.config
+include ../config/Makefile.config
 
 OMPFLAGS=
 OMPLIB=
 
-# Directory containing libraries
-LIBDIR          = $(CLASS_lib)
 # Directory containing includes for CLASS
-LOCALINC	= $(CLASS_include)
+LOCALINC	= ../source/include
 
 ######################################################
 ######### nothing to change from here ################
@@ -15,11 +13,11 @@ LOCALINC	= $(CLASS_include)
 #------------------------------------------------------------------------------
 CXXFLAGS      += -g -I$(LOCALINC)
 LD            = $(CXX)
-LIBS          += -L$(LIBDIR) -lCLASSpkg -lgomp
-LDFLAGS       = -g
+LIBS          += -L$(LIBDIR) -lCLASSpkg $(OMPLIB)
+LDFLAGS       =
 GLIBS         = $(ROOTGLIBS) -lTMVA
 
-CXXFLAGS     += -g $(ROOTCFLAGS)
+CXXFLAGS     += $(ROOTCFLAGS)
 
 #------------------------------------------------------------------------------
 subO	= CLASSPlotElement.o \
@@ -48,7 +46,7 @@ all:    $(OBJS)
 	@mkdir -p bin
 	@mv  $(main) bin/
 	@echo "$(main) done"
-	@echo "CLASSGui is now available in $(CLASS_PATH)/Gui/bin !!"
+	@echo "CLASSGui is now available in $LIBDIR/../gui/bin "
 
 
 
@@ -69,5 +67,5 @@ CLASSWin.o:	CLASSRead.hxx \
 CLASSPlotElement.o:	CLASSPlotElement.hxx
 
 .cxx.o:
-	$(CXX) $(CXXFLAGS)  -c  $<
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c  $<
 
-- 
GitLab