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 780 by mmeineke, Mon Sep 22 21:23:25 2003 UTC vs.
Revision 826 by gezelter, Mon Oct 27 23:00:59 2003 UTC

# Line 46 | Line 46 | MPI_INC=@MPI_INC@
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  
# Line 102 | Line 105 | FFLAGS_C=@F90FLAGS@
105   PREPDEFFLAG=@PREPDEFFLAG@
106  
107   # Fortran flags
108 < FFLAGS_C=@F90FLAGS@
108 > FFLAGS_C=@FFLAGS@
109  
110 + # Fortran90 flags
111 + F90FLAGS_C=@F90FLAGS@
112 +
113   # LDFLAGS
114   LDFLAGS=@LDFLAGS@
115  
# Line 115 | Line 121 | MPI_INCLUDES= -I$(MPI_INC) $(MPI_F90_MODS)
121   # include paths starting with "." are all relative to the SUBDIRS!!!
122  
123   INCLUDES= -I.. -I../../libBASS $(SPRNG_INC)
124 < MPI_INCLUDES= -I$(MPI_INC) $(MPI_F90_MODS)
124 > MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS)
125  
126   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP)
127   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
128   FFLAGS=$(PREPFLAG) $(FFLAGS_C)
129 + F90FLAGS=$(PREPFLAG) $(F90FLAGS_C)
130   DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES)
131  
132   MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
133   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
134 < MPI_FFLAGS=$(FFLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
134 > MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
135  
136   SRC_DIR := $(PWD)
137  
138   # Then do the compile rules:
139  
140   obj/%.o: %.F90
141 <        cd obj; $(F90) $(FFLAGS) -c  $(SRC_DIR)/$<
141 >        cd obj; $(F90) $(F90FLAGS) -c  $(SRC_DIR)/$<
142  
143   MPIobj/%.o: %.F90
144 <        cd MPIobj; $(F90) $(MPI_FFLAGS) -c $(SRC_DIR)/$<
144 >        cd MPIobj; $(F90) $(MPI_F90FLAGS) -c $(SRC_DIR)/$<
145  
146   obj/%.o: %.cpp
147          cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
# Line 162 | Line 169 | CXX_FILES = \
169          $(DIR)/BondExtensions.cpp \
170          $(DIR)/DirectionalAtom.cpp \
171          $(DIR)/DumpWriter.cpp \
172 +        $(DIR)/DumpReader.cpp \
173          $(DIR)/Exclude.cpp \
174          $(DIR)/InitializeFromFile.cpp \
175          $(DIR)/LJFF.cpp \
# Line 182 | Line 190 | CXX_FILES = \
190          $(DIR)/Molecule.cpp \
191          $(DIR)/NPTf.cpp \
192          $(DIR)/NPTi.cpp \
193 <        $(DIR)/NPTxym.cpp \
186 <        $(DIR)/NPTzm.cpp \
193 >        $(DIR)/NPTxyz.cpp \
194          $(DIR)/NVT.cpp \
195          $(DIR)/SimState.cpp \
196          $(DIR)/ZConstraint.cpp \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines