46 |
|
# MPICH include path |
47 |
|
MPI_INC=@MPI_INC@ |
48 |
|
|
49 |
+ |
# MODDIRFLAG |
50 |
+ |
MODDIRFLAG=@MODDIRFLAG@ |
51 |
+ |
|
52 |
|
# MPI F90 Module path |
53 |
|
MPI_F90_MODS=@MPI_F90_MODS@ |
54 |
|
|
97 |
|
|
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@ |
127 |
|
# include paths starting with "." are all relative to the SUBDIRS!!! |
128 |
|
|
129 |
|
INCLUDES= -I.. -I../../libBASS $(SPRNG_INC) |
130 |
< |
MPI_INCLUDES= -I$(MPI_INC) $(MPI_F90_MODS) |
130 |
> |
MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS) |
131 |
|
|
132 |
|
CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP) |
133 |
< |
CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
133 |
> |
CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
134 |
|
FFLAGS=$(PREPFLAG) $(FFLAGS_C) |
135 |
|
F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) |
136 |
|
DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES) |
139 |
|
MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE) |
140 |
|
MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES) |
141 |
|
|
142 |
< |
SRC_DIR := $(PWD) |
142 |
> |
SRC_DIR := .. |
143 |
|
|
144 |
|
# Then do the compile rules: |
145 |
|
|
196 |
|
$(DIR)/Molecule.cpp \ |
197 |
|
$(DIR)/NPTf.cpp \ |
198 |
|
$(DIR)/NPTi.cpp \ |
199 |
< |
$(DIR)/NPTxym.cpp \ |
191 |
< |
$(DIR)/NPTzm.cpp \ |
199 |
> |
$(DIR)/NPTxyz.cpp \ |
200 |
|
$(DIR)/NVT.cpp \ |
201 |
|
$(DIR)/SimState.cpp \ |
202 |
|
$(DIR)/ZConstraint.cpp \ |