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

Comparing trunk/OOPSE-1.0/src/Makefile.in (file contents):
Revision 1334 by gezelter, Fri Jul 16 18:58:03 2004 UTC vs.
Revision 1372 by chrisfen, Thu Jul 22 15:06:16 2004 UTC

# Line 29 | Line 29 | SPRNG_LIBDIR=@SPRNG_LIBDIR@
29   SAMPLE_SIM_DIR=@OOPSE_HOME@/share/samples/
30  
31   # SPRNG library path
32 < SPRNG_LIBDIR=@SPRNG_LIBDIR@
32 > SPRNG_LIB_DIR=@SPRNG_LIB_DIR@
33  
34   # SPRNG library
35   SPRNG_LIB=@SPRNG_LIB@
36  
37   # SPRNG include path
38 < SPRNG_INC=@SPRNG_INC@
38 > SPRNG_INC_DIR=@SPRNG_INC_DIR@
39    
40   # Compile MPI code?
41   USE_MPI=@USE_MPI@
# Line 132 | Line 132 | CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA
132  
133   INCLUDES= -I.. -I../../libBASS -I../../libmdtools
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
135 > CXXFLAGS=$(CXXFLAGS_C) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
136 > DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
137   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
138  
139   OOPSE=oopse$(EXE)
# Line 146 | Line 146 | OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(
146   LIBS=$(MD_LIB) $(BASS_LIB)
147   MPI_LIBS=$(MD_MPI_LIB) $(BASS_MPI_LIB)
148  
149 < OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
149 > OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIB_DIR) $(SPRNG_LIB)
150  
151 < OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIB_DIR) $(MPI_F90_LIB) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
151 > OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIB_DIR) $(MPI_F90_LIB) $(MPI_LIB) -L$(SPRNG_LIB_DIR) $(SPRNG_LIB)
152  
153  
154   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
155  
156   obj/%.o: %.cpp
157 <        cd obj; $(CXX) $(CXXFLAGS) -c ../$<
157 >        cd obj; $(CXX) $(CXXFLAGS) $(OOPSE_TEMPLATE_FLAGS) -c ../$<
158  
159   MPIobj/%.o: %.cpp
160 <        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$<
160 >        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) $(OOPSE_TEMPLATE_FLAGS) -c ../$<
161  
162   CXX_FILES = \
163          $(DIR)/oopse.cpp \
# Line 187 | Line 187 | oopse$(EXE) : $(OBJS) $(BASS_LIB) $(MD_LIB)
187   depend: Make.dep
188  
189   oopse$(EXE) : $(OBJS) $(BASS_LIB) $(MD_LIB)
190 <        $(CXX) $(CFLAGS) $(OBJS) -o $@ $(OOPSE_LDFLAGS)
190 >        $(CXX) $(CXXFLAGS) $(OBJS) -o $@ $(OOPSE_LDFLAGS)
191  
192   oopse_MPI$(EXE) : $(MPIOBJS) $(BASS_MPI_LIB) $(MD_MPI_LIB)
193 <        $(CXX) $(CFLAGS) $(MPIOBJS) -o $@ $(OOPSE_MPI_LDFLAGS)
193 >        $(CXX) $(CXXFLAGS) $(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