102 |
|
PREPDEFFLAG=@PREPDEFFLAG@ |
103 |
|
|
104 |
|
# Fortran flags |
105 |
< |
FFLAGS_C=@F90FLAGS@ |
105 |
> |
FFLAGS_C=@FFLAGS@ |
106 |
|
|
107 |
+ |
# Fortran90 flags |
108 |
+ |
F90FLAGS_C=@F90FLAGS@ |
109 |
+ |
|
110 |
|
# LDFLAGS |
111 |
|
LDFLAGS=@LDFLAGS@ |
112 |
|
|
123 |
|
CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP) |
124 |
|
CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
125 |
|
FFLAGS=$(PREPFLAG) $(FFLAGS_C) |
126 |
+ |
F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) |
127 |
|
DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES) |
128 |
|
|
129 |
|
MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE) |
130 |
|
MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE) |
131 |
< |
MPI_FFLAGS=$(FFLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES) |
131 |
> |
MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES) |
132 |
|
|
133 |
|
SRC_DIR := $(PWD) |
134 |
|
|
135 |
|
# Then do the compile rules: |
136 |
|
|
137 |
|
obj/%.o: %.F90 |
138 |
< |
cd obj; $(F90) $(FFLAGS) -c $(SRC_DIR)/$< |
138 |
> |
cd obj; $(F90) $(F90FLAGS) -c $(SRC_DIR)/$< |
139 |
|
|
140 |
|
MPIobj/%.o: %.F90 |
141 |
< |
cd MPIobj; $(F90) $(MPI_FFLAGS) -c $(SRC_DIR)/$< |
141 |
> |
cd MPIobj; $(F90) $(MPI_F90FLAGS) -c $(SRC_DIR)/$< |
142 |
|
|
143 |
|
obj/%.o: %.cpp |
144 |
|
cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$< |
184 |
|
$(DIR)/ForceFields.cpp \ |
185 |
|
$(DIR)/mpiSimulation.cpp \ |
186 |
|
$(DIR)/Molecule.cpp \ |
187 |
+ |
$(DIR)/NPTf.cpp \ |
188 |
+ |
$(DIR)/NPTi.cpp \ |
189 |
+ |
$(DIR)/NPTxym.cpp \ |
190 |
+ |
$(DIR)/NPTzm.cpp \ |
191 |
+ |
$(DIR)/NVT.cpp \ |
192 |
|
$(DIR)/SimState.cpp \ |
193 |
|
$(DIR)/ZConstraint.cpp \ |
194 |
|
$(DIR)/ZConsWriter.cpp \ |