98 |
|
# C++ flags |
99 |
|
CXXFLAGS_C=@CXXFLAGS@ |
100 |
|
|
101 |
+ |
# C++ template flags |
102 |
+ |
OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@ |
103 |
+ |
|
104 |
+ |
# C++ namespace flags |
105 |
+ |
EXTRA_CC_FLAG=@EXTRA_CC_FLAG@ |
106 |
+ |
|
107 |
|
# Preprocessor flag for fortran |
108 |
|
PREPFLAG=@PREPFLAG@ |
109 |
|
|
128 |
|
|
129 |
|
INCLUDES= -I.. -I../../libBASS $(SPRNG_INC) |
130 |
|
MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS) |
131 |
+ |
F90_INCLUDES= -I/usr/local/include |
132 |
|
|
133 |
|
CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP) |
134 |
< |
CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
134 |
> |
CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
135 |
|
FFLAGS=$(PREPFLAG) $(FFLAGS_C) |
136 |
< |
F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) |
136 |
> |
F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES) |
137 |
|
DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES) |
138 |
|
|
139 |
|
MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE) |
221 |
|
$(DIR)/calc_gb.F90 \ |
222 |
|
$(DIR)/force_globals.F90 \ |
223 |
|
$(DIR)/mpiSimulation_module.F90 \ |
224 |
< |
$(DIR)/notifyCutoffs.F90 |
224 |
> |
$(DIR)/notifyCutoffs.F90 \ |
225 |
> |
$(DIR)/oopseMPI_module.F90 |
226 |
|
|
227 |
|
DIR:=. |
228 |
|
C_SRCS := $(C_FILES) |
406 |
|
|
407 |
|
MPIobj/status_module$(O): ./status_module.F90 |
408 |
|
|
409 |
< |
MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 |
409 |
> |
MPIobj/oopseMPI_module$(O): ./oopseMPI_module.F90 |
410 |
|
|
411 |
+ |
MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 \ |
412 |
+ |
MPIobj/oopseMPI_module$(O) |
413 |
+ |
|
414 |
|
MPIobj/force_globals$(O): ./force_globals.F90 \ |
415 |
|
MPIobj/mpiSimulation_module$(O) \ |
416 |
|
MPIobj/definitions_module$(O) |