Diff of /trunk/gadget/Makefile

Parent Directory | Revision Log | Patch

	revision 10, Wed Jun 10 13:01:42 2015 UTC	revision 11, Thu Jul 23 19:00:38 2015 UTC
#	Line 6	Line 6
6	-Wreorder -Wwrite-strings -Wsynth -Wchar-subscripts \	-Wreorder -Wwrite-strings -Wsynth -Wchar-subscripts \
7	-Wuninitialized -W -pedantic	-Wuninitialized -W -pedantic
8
9	#DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O	#DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O3
10	DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3	DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3
11		#DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 -pg
12	#-s	#-s
13
14	##########################################################################	##########################################################################
#	Line 24	Line 25
25	#CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK	#CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK
26	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)
27	##########################################################################	##########################################################################
28	# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler	# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler - sequential
29		#CXX = g++
30		#LIBDIRS = -L. -L/usr/local/lib
31		#LIBRARIES = -lm
32		#CXXFLAGS = $(DEFINE_FLAGS) -D NO_OPENMP
33		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
34		##########################################################################
35		# 2,5. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Reproducible
36		#CXX = g++
37		#LIBDIRS = -L. -L/usr/local/lib
38		#LIBRARIES = -lm
39		#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
40		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
41		##########################################################################
42		# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative: launch gadget with -omp
43	CXX = g++	CXX = g++
44	LIBDIRS = -L. -L/usr/local/lib	LIBDIRS = -L. -L/usr/local/lib
45	LIBRARIES = -lm	LIBRARIES = -lm
46	CXXFLAGS = $(DEFINE_FLAGS)	CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -D GADGET_OPENMP
47	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
48	##########################################################################	##########################################################################
49	# 3. Solaris, without pvm3, using CC compiler	# 3. Solaris, without pvm3, using CC compiler
#	Line 82	Line 97
97	tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \	tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \
98	stockvariable.o modelvariable.o migrationproportion.o matrix.o	stockvariable.o modelvariable.o migrationproportion.o matrix.o
99
100		GADGETCLASSES = agebandmatrixmemberfunctions.cc grow.cc growermemberfunctions.cc
101
102	SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o	SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o
103
104	GADGETINPUT = intvector.o doublevector.o charptrvector.o initialinputfile.o \	GADGETINPUT = intvector.o doublevector.o charptrvector.o initialinputfile.o \
#	Line 89	Line 106
106
107	LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)	LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)
108
109		partial :       $(OBJECTS)
110		$(CXX) -c $(LDFLAGS) $(GADGETCLASSES)
111
112	gadget  :       $(OBJECTS)	gadget  :       $(OBJECTS)
113	$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)	$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)
114

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.10   changed lines   Added in v.11

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0