ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Makefile.in
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Makefile.in (file contents):
Revision 761 by gezelter, Fri Sep 12 16:20:16 2003 UTC vs.
Revision 812 by mmeineke, Wed Oct 22 21:17:32 2003 UTC

# Line 102 | Line 102 | FFLAGS_C=@F90FLAGS@
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  
# Line 120 | Line 123 | DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(M
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)/$<
# Line 162 | Line 166 | CXX_FILES = \
166          $(DIR)/BondExtensions.cpp \
167          $(DIR)/DirectionalAtom.cpp \
168          $(DIR)/DumpWriter.cpp \
169 +        $(DIR)/DumpReader.cpp \
170          $(DIR)/Exclude.cpp \
171          $(DIR)/InitializeFromFile.cpp \
172          $(DIR)/LJFF.cpp \
# Line 182 | Line 187 | CXX_FILES = \
187          $(DIR)/Molecule.cpp \
188          $(DIR)/NPTf.cpp \
189          $(DIR)/NPTi.cpp \
190 <        $(DIR)/NPTim.cpp \
186 <        $(DIR)/NPTxym.cpp \
187 <        $(DIR)/NPTzm.cpp \
190 >        $(DIR)/NPTxyz.cpp \
191          $(DIR)/NVT.cpp \
189        $(DIR)/NPTfm.cpp \
192          $(DIR)/SimState.cpp \
193          $(DIR)/ZConstraint.cpp \
194          $(DIR)/ZConsWriter.cpp \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines