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

Comparing trunk/OOPSE/src/Makefile.in (file contents):
Revision 838 by gezelter, Wed Oct 29 03:06:51 2003 UTC vs.
Revision 944 by gezelter, Wed Jan 14 22:41:34 2004 UTC

# Line 37 | Line 37 | SPRNG_INC=@SPRNG_INC@
37   # SPRNG include path
38   SPRNG_INC=@SPRNG_INC@
39  
40 < # MPICH library path
40 > # MPI library path
41   MPI_LIBDIR=@MPI_LIBDIR@
42  
43 < # MPICH library
43 > # MPI library
44   MPI_LIB=@MPI_LIB@
45  
46 < # MPICH include path
46 > # MPI F90 library
47 > MPI_F90LIB=@MPI_F90LIB@
48 >
49 > # MPI include path
50   MPI_INC=@MPI_INC@
51  
52 < # MPI F90 Module path
53 < MPI_F90_MODS=@MPI_F90_MODS@
52 > # MPI F90 include path
53 > MPI_F90INC=@MPI_F90INC@
54  
52 # MPI F90 libname
53 MPIMODLIBNAME=@MPIMODLIBNAME@
54
55   # Location of yacc (or its substitution)
56   YACC=@YACC@
57  
# Line 98 | Line 98 | CXXFLAGS_C=@CXXFLAGS@
98   # C++ flags
99   CXXFLAGS_C=@CXXFLAGS@
100  
101 + # C++ template flags
102 + OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
103 +
104 + # C++ namespace flag
105 + EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
106 +
107   # Preprocessor flag for fortran
108   PREPFLAG=@PREPFLAG@
109  
# Line 123 | Line 129 | CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
129  
130   INCLUDES= -I.. -I../../libBASS -I../../libmdtools
131   MPI_INCLUDES= -I$(MPI_INC)  
132 < CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
132 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
133   DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
134   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
135  
# Line 139 | Line 145 | OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(
145  
146   OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
147  
148 < OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) $(MPI_LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
148 > OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPI_F90LIB) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
149  
150 +
151   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
152  
153   obj/%.o: %.cpp

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines