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

Comparing trunk/OOPSE/libmdtools/Makefile (file contents):
Revision 466 by gezelter, Mon Apr 7 14:30:36 2003 UTC vs.
Revision 616 by mmeineke, Tue Jul 15 18:52:16 2003 UTC

# Line 29 | Line 29 | MPI_FFLAGS=$(FFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
29   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
30   MPI_FFLAGS=$(FFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
31  
32 + SRC_DIR := $(PWD)
33 +
34   # Then do the compile rules:
35  
36   obj/%.o: %.F90
37 <        cd obj; $(FC) $(FFLAGS) -c  ../$<
37 >        cd obj; $(FC) $(FFLAGS) -c  $(SRC_DIR)/$<
38  
39   MPIobj/%.o: %.F90
40 <        cd MPIobj; $(FC) $(MPI_FFLAGS) -c ../$<
40 >        cd MPIobj; $(FC) $(MPI_FFLAGS) -c $(SRC_DIR)/$<
41  
42   obj/%.o: %.cpp
43 <        cd obj; $(CXX) $(CXXFLAGS) -c ../$<
43 >        cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
44  
45   MPIobj/%.o: %.cpp
46 <        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$<
46 >        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c $(SRC_DIR)/$<
47  
48   obj/%.o: %.c
49 <        cd obj; $(CC) $(CFLAGS) -c ../$<
49 >        cd obj; $(CC) $(CFLAGS) -c $(SRC_DIR)/$<
50  
51   MPIobj/%.o: %.c
52 <        cd MPIobj; $(CC) $(MPI_CFLAGS) -c ../$<
52 >        cd MPIobj; $(CC) $(MPI_CFLAGS) -c $(SRC_DIR)/$<
53  
54   # Then list what we have to compile
55  
# Line 62 | Line 64 | CXX_FILES = \
64          $(DIR)/DirectionalAtom.cpp \
65          $(DIR)/DumpWriter.cpp \
66          $(DIR)/Exclude.cpp \
65        $(DIR)/ExtendedSystem.cpp \
67          $(DIR)/InitializeFromFile.cpp \
68 <        $(DIR)/LJ_FF.cpp \
68 >        $(DIR)/LJFF.cpp \
69          $(DIR)/SimInfo.cpp \
70          $(DIR)/SimSetup.cpp \
71          $(DIR)/StatWriter.cpp \
72 <        $(DIR)/Symplectic.cpp \
72 >        $(DIR)/Integrator.cpp \
73          $(DIR)/Thermo.cpp \
74          $(DIR)/GhostBend.cpp \
75          $(DIR)/Torsion.cpp \
76          $(DIR)/TorsionExtensions.cpp \
77 <        $(DIR)/TraPPE_ExFF.cpp \
77 <        $(DIR)/Verlet.cpp \
77 >        $(DIR)/DUFF.cpp \
78          $(DIR)/randomSPRNG.cpp \
79          $(DIR)/fortranWrappers.cpp \
80          $(DIR)/ForceFields.cpp \
81          $(DIR)/mpiSimulation.cpp \
82 <        $(DIR)/Molecule.cpp
82 >        $(DIR)/Molecule.cpp \
83 >        $(DIR)/NVT.cpp \
84 >        $(DIR)/NPTi.cpp \
85 >        $(DIR)/NPTf.cpp \
86 >        $(DIR)/NPTim.cpp \
87 >        $(DIR)/NPTfm.cpp
88  
89  
90   F90_FILES= \
91          $(DIR)/Linux_ifc_machdep.F90 \
92          $(DIR)/atype_module.F90 \
88        $(DIR)/f_verlet_constrained.F90 \
93          $(DIR)/calc_dipole_dipole.F90 \
94          $(DIR)/calc_reaction_field.F90 \
95          $(DIR)/calc_LJ_FF.F90 \
# Line 156 | Line 160 | Make.dep : $(SRCS)
160          echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
161          $(CC) $(DEPFLAGS) -MM $(C_SRCS) $(CXX_SRCS) \
162                  | sed 's/\.o:/\$$(O)\ :/g' > Make.temp
163 <        cat Make.temp | sed 's/^/obj\//' >> Make.dep
164 <        cat Make.temp | sed 's/^/MPIobj\//' >> Make.dep
163 >        cat Make.temp | sed 's/^[a-zA-Z0-9]/obj\/&/g' >> Make.dep
164 >        cat Make.temp | sed 's/^[a-zA-Z0-9]/MPIobj\/&/g' >> Make.dep
165   #       ../scripts/sfmakedepend -I $(MPI_F90_MODS) -d obj -f ./Make.ftemp -h *.F90
166   #       ../scripts/sfmakedepend -I $(MPI_F90_MODS) -d MPIobj -f ./Make.ftemp -h *.F90
167   #       cat Make.ftemp | sed 's/\.o:/\$$(O)\ :/g' >> Make.dep

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines