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 1233 by gezelter, Fri Jun 4 02:38:23 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 < # MPICH library path
44 < MPI_LIBDIR=@MPI_LIBDIR@
43 > # MPI include path
44 > MPI_INC_DIR=@MPI_INC_DIR@
45 >                                                                                
46 > # MPI include path
47 > MPI_F90_INC=@MPI_F90_INC@
48  
49 < # MPICH library
49 > # MPI library path
50 > MPI_LIB_DIR=@MPI_LIB_DIR@
51 >
52 > # MPI library
53   MPI_LIB=@MPI_LIB@
54  
55 < # MPICH include path
56 < MPI_INC=@MPI_INC@
55 > # MPI F90 library
56 > MPI_F90_LIB=@MPI_F90_LIB@
57  
49 # MPI F90 Module path
50 MPI_F90_MODS=@MPI_F90_MODS@
51
52 # MPI F90 libname
53 MPIMODLIBNAME=@MPIMODLIBNAME@
54
58   # Location of yacc (or its substitution)
59   YACC=@YACC@
60  
# Line 98 | Line 101 | CXXFLAGS_C=@CXXFLAGS@
101   # C++ flags
102   CXXFLAGS_C=@CXXFLAGS@
103  
104 + # C++ template flags
105 + OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
106 +
107 + # C++ namespace flag
108 + EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
109 +
110   # Preprocessor flag for fortran
111   PREPFLAG=@PREPFLAG@
112  
# Line 122 | Line 131 | MPI_INCLUDES= -I$(MPI_INC)  
131   # include paths starting with "." are all relative to the SUBDIRS!!!
132  
133   INCLUDES= -I.. -I../../libBASS -I../../libmdtools
134 < MPI_INCLUDES= -I$(MPI_INC)  
135 < CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
134 > MPI_INCLUDES= -I$(MPI_INC_DIR)  
135 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
136   DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
137   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
138  
# Line 139 | Line 148 | OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(
148  
149   OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
150  
151 < OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) $(MPI_LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
151 > OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIB_DIR) $(MPI_F90_LIB) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
152  
153 +
154   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
155  
156   obj/%.o: %.cpp
# Line 168 | Line 178 | all : $(OOPSE) $(OOPSE_MPI)
178          obj \
179          MPIobj
180  
181 + ifeq ($(USE_MPI),yes)
182   all : $(OOPSE) $(OOPSE_MPI)
183 + else
184 + all : $(OOPSE)
185 + endif
186  
187   depend: Make.dep
188  
189   oopse$(EXE) : $(OBJS) $(BASS_LIB) $(MD_LIB)
190 <        $(CXX) $(CFLAGS) $(OBJS) -g -o $@ $(OOPSE_LDFLAGS)
190 >        $(CXX) $(CFLAGS) $(OBJS) -o $@ $(OOPSE_LDFLAGS)
191  
192   oopse_MPI$(EXE) : $(MPIOBJS) $(BASS_MPI_LIB) $(MD_MPI_LIB)
193 <        $(CXX) $(CFLAGS) $(MPIOBJS) -g  -o $@ $(OOPSE_MPI_LDFLAGS)
193 >        $(CXX) $(CFLAGS) $(MPIOBJS) -o $@ $(OOPSE_MPI_LDFLAGS)
194  
195   install : $(OOPSE) $(OOPSE_MPI)
196          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines