--- trunk/gadget/Makefile	2017/04/07 09:20:55	20
+++ trunk/gadget/Makefile	2017/04/26 09:06:03	24
@@ -7,7 +7,7 @@
               -Wuninitialized -W -pedantic
 
 #DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O3
-DEFINE_FLAGS = -D NDEBUG -O3#-D INTERRUPT_HANDLER -O3
+DEFINE_FLAGS = -D NDEBUG -O3 #-D INTERRUPT_HANDLER -O3
 #DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 -pg
 #-s
 
@@ -42,17 +42,17 @@
 #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
 # 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative
-CXX = icpc 
-LIBDIRS = -L. 
-LIBRARIES = 
+#CXX = icpc 
+#LIBDIRS = -L. 
+#LIBRARIES = 
 #CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic  -DSPECULATIVE
-CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp
-OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
-#CXX = g++
-#LIBDIRS = -L. -L/usr/local/lib
-#LIBRARIES = -lm
-#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -DSPECULATIVE
+#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp
 #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
+CXX = g++#-6
+LIBDIRS = -L. -L/usr/local/lib
+LIBRARIES = -lm
+CXXFLAGS = $(DEFINE_FLAGS) -fopenmp 
+OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
 # 3. Solaris, without pvm3, using CC compiler
 #CXX = CC
@@ -136,7 +136,7 @@
 		ar rs libgadgetinput.a $?
 
 clean	:
-		rm -f $(OBJECTS) libgadgetinput.a
+		rm -f $(OBJECTS) libgadgetinput.a gadget
 
 depend	:
 		$(CXX) -M -MM $(CXXFLAGS) *.cc