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 1224 by gezelter, Wed Jun 2 18:27:52 2004 UTC vs.
Revision 1234 by tim, Fri Jun 4 03:15:31 2004 UTC

# Line 36 | Line 36 | SPRNG_INC=@SPRNG_INC@
36  
37   # SPRNG include path
38   SPRNG_INC=@SPRNG_INC@
39 +
40 + # Compile MPI code?
41 + USE_MPI=@USE_MPI@
42 +  
43 + # MPI include path
44 + MPI_INC_DIR=@MPI_INC_DIR@
45  
46 < # MPICH library path
47 < MPI_LIBDIR=@MPI_LIBDIR@
46 > # MPI include path
47 > MPI_F90_INC=@MPI_F90_INC@
48  
43 # MPICH library
44 MPI_LIB=@MPI_LIB@
45
46 # MPICH include path
47 MPI_INC=@MPI_INC@
48
49 # MODDIRFLAG
50 MODDIRFLAG=@MODDIRFLAG@
51
49   # Compiler dependent Fortran module
50   FLIBS_EXTRA = @F90LIBS@
51  
# Line 124 | Line 121 | MPI_INCLUDES= -I$(MPI_INC)
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)
125 < F90_INCLUDES= -I/usr/local/include
124 > MPI_INCLUDES= -I$(MPI_INC_DIR)
125 > MPI_F90_INCLUDES= -I$(MPI_F90_INC)
126  
127 < CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP)
128 < CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
127 > CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE)
128 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE)
129   FFLAGS=$(PREPFLAG) $(FFLAGS_C)
130 < F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES)
130 > F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) -I../../libBASS
131   DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES)
132  
133   MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
134   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
135 < MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
135 > MPI_F90FLAGS=$(F90FLAGS) $(MPI_F90_INCLUDES) $(PREPDEFFLAG)$(MPI_DECLARE)
136  
137   SRC_DIR := ..
138  
# Line 219 | Line 216 | CXX_FILES = \
216          $(DIR)/ZConsReader.cpp \
217          $(DIR)/ZConstraint.cpp \
218          $(DIR)/ZconsVisitor.cpp \
219 +        $(DIR)/Restraints.cpp   \
220 +        $(DIR)/ConstraintManager.cpp \
221 +        $(DIR)/ConstraintAlgorithm.cpp \
222 +        $(DIR)/Shake.cpp \
223 +        $(DIR)/Rattle.cpp \
224 +        $(DIR)/ShakeMin.cpp \
225 +        $(DIR)/CallbackFunctor.cpp \
226 +        $(DIR)/ConstraintElement.cpp \
227          $(DIR)/ZConsWriter.cpp
228  
229   F90_FILES= \
# Line 268 | Line 273 | all: libmdtools.a libmdtools_MPI.a
273  
274   # Possible make targets:
275  
276 + ifeq ($(USE_MPI),yes)
277   all: libmdtools.a libmdtools_MPI.a
278 + else
279 + all: libmdtools.a
280 + endif
281 +
282  
283   libmdtools.a: $(OBJS)
284          $(RM) $@

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines