Modification du makefile des TPL

tpl/CMAES.tpl

@@ -450,32 +450,23 @@ public:
 
 UNAME := $(shell uname)
 
-#ifeq ($(UNAME),Darwin)
 EASEALIB_PATH=$(EZ_PATH)libeasea/
-#else
-#EASEALIB_PATH=\EZ_PATHlibeasea/
-#endif
 
-ifeq ($(UNAME),Darwin)
 CXXFLAGS =      -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
-else
-CXXFLAGS =      -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include
-endif
+
+#USER MAKEFILE OPTIONS :
+\INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
 
 OBJS = EASEA.o EASEAIndividual.o 
 
-ifeq ($(UNAME),Darwin)
-LIBS = $(EZ_PATH)boost/program_options.a
-else
-LIBS = -lboost_program_options -lpthread
-endif
+LIBS = -lpthread
 
 \INSERT_MAKEFILE_OPTION
 
 TARGET =	EASEA
 
 $(TARGET):	$(OBJS)
-	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a
+	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(EZ_PATH)boost/program_options.a
 
 	
 #%.o:%.cpp

tpl/CUDA.tpl

@@ -657,14 +657,14 @@ public:
 \START_CUDA_MAKEFILE_TPL
 NVCC= nvcc
 CPPC= g++
-LIBAESAE=\EZ_PATHlibeasea/
-CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include
-LDFLAGS=-lboost_program_options $(LIBAESAE)libeasea.a -lpthread
+LIBAESAE=$(EZ_PATH)libeasea/
+CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include -I$(EZ_PATH)boost
+LDFLAGS=$(EZ_PATH)boost/program_options.a $(LIBAESAE)libeasea.a -lpthread
 
 #USER MAKEFILE OPTIONS :
 \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
 
-CPPFLAGS+= -I$(LIBAESAE)include -I/usr/local/cuda/include/
+CPPFLAGS+= -I$(LIBAESAE)include -I$(EZ_PATH)boost
 NVCCFLAGS+=
 
 

tpl/CUDA_MEM.tpl

@@ -749,14 +749,14 @@ public:
 \START_CUDA_MAKEFILE_TPL
 NVCC= nvcc
 CPPC= g++
-LIBAESAE=\EZ_PATHlibeasea/
-CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include
-LDFLAGS=-lboost_program_options $(LIBAESAE)libeasea.a -lpthread
+LIBAESAE=$(EZ_PATH)libeasea/
+CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include -I$(EZ_PATH)boost
+LDFLAGS=$(EZ_PATH)boost/program_options.a $(LIBAESAE)libeasea.a -lpthread
 
 #USER MAKEFILE OPTIONS :
 \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
 
-CPPFLAGS+= -I$(LIBAESAE)include
+CPPFLAGS+= -I$(LIBAESAE)include -I$(EZ_PATH)boost
 NVCCFLAGS+=
 
 

tpl/STD_MEM.tpl

@@ -484,30 +484,21 @@ public:
 
 UNAME := $(shell uname)
 
-#ifeq ($(UNAME),Darwin)
 EASEALIB_PATH=$(EZ_PATH)libeasea/
-#else
-#EASEALIB_PATH=\EZ_PATHlibeasea/
-#endif
 
-ifeq ($(UNAME),Darwin)
 CXXFLAGS =      -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
-else
-CXXFLAGS =      -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include
-endif
+
+#USER MAKEFILE OPTIONS :
+\INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
 
 OBJS = EASEA.o EASEAIndividual.o 
 
-ifeq ($(UNAME),Darwin)
-LIBS = $(EZ_PATH)boost/program_options.a
-else
-LIBS = -lboost_program_options -lpthread
-endif
+LIBS = -lpthread
 
 TARGET =	EASEA
 
 $(TARGET):	$(OBJS)
-	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a
+	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(EZ_PATH)boost/program_options.a
 
 	
 #%.o:%.cpp