Diff of /trunk/gadget/Makefile

Parent Directory | Revision Log | Patch

	revision 5, Sun May 10 12:04:01 2015 UTC	revision 15, Tue Sep 1 19:14:33 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	##########################################################################	##########################################################################
15	# The name of the final executable (eg gadget-paramin or gadget.exe)	# The name of the final executable (eg gadget-paramin or gadget.exe)
16	#GADGET = gadget-paramin	#GADGET = gadget-paramin
17	GADGET = gadget	#GADGET = gadget
18		GADGET = gadget-ompRepro
19		#GADGET = gadget-ompSpec
20	##########################################################################	##########################################################################
21	# Pick the appropriate compiler from the following switches	# Pick the appropriate compiler from the following switches
22	##########################################################################	##########################################################################
#	Line 24	Line 27
27	#CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK	#CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK
28	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)
29	##########################################################################	##########################################################################
30	# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler	# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler - sequential
31		#CXX = g++
32		#LIBDIRS = -L. -L/usr/local/lib
33		#LIBRARIES = -lm
34		#CXXFLAGS = $(DEFINE_FLAGS) -D NO_OPENMP
35		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
36		##########################################################################
37		# 2,5. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Reproducible
38	CXX = g++	CXX = g++
39	LIBDIRS = -L. -L/usr/local/lib	LIBDIRS = -L. -L/usr/local/lib
40	LIBRARIES = -lm	LIBRARIES = -lm
41	CXXFLAGS = $(DEFINE_FLAGS)	CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
42	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
43	##########################################################################	##########################################################################
44		# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative
45		#CXX = g++
46		#LIBDIRS = -L. -L/usr/local/lib
47		#LIBRARIES = -lm
48		#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -D SPECULATIVE
49		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
50		##########################################################################
51	# 3. Solaris, without pvm3, using CC compiler	# 3. Solaris, without pvm3, using CC compiler
52	#CXX = CC	#CXX = CC
53	#LIBDIRS = -L. -L/usr/local/lib	#LIBDIRS = -L. -L/usr/local/lib
#	Line 82	Line 99
99	tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \	tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \
100	stockvariable.o modelvariable.o migrationproportion.o matrix.o	stockvariable.o modelvariable.o migrationproportion.o matrix.o
101
102		GADGETCLASSES = agebandmatrixmemberfunctions.cc grow.cc growermemberfunctions.cc
103
104	SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o	SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o
105
106	GADGETINPUT = intvector.o doublevector.o charptrvector.o initialinputfile.o \	GADGETINPUT = intvector.o doublevector.o charptrvector.o initialinputfile.o \
#	Line 89	Line 108
108
109	LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)	LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)
110
111		partial :       $(OBJECTS)
112		$(CXX) -c $(LDFLAGS) $(GADGETCLASSES)
113
114	gadget  :       $(OBJECTS)	gadget  :       $(OBJECTS)
115	$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)	$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)
116

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.5   changed lines   Added in v.15

---

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