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 785 by gezelter, Thu Sep 25 16:42:34 2003 UTC vs.
Revision 840 by gezelter, Wed Oct 29 14:29:12 2003 UTC

# 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 137 | Line 143 | OOPSE_LDFLAGS= $(F90LIBS) $(LIBS) -L$(SPRNG_LIBDIR) $(
143   LIBS=$(MD_LIB) $(BASS_LIB)
144   MPI_LIBS=$(MD_MPI_LIB) $(BASS_MPI_LIB)
145  
146 < OOPSE_LDFLAGS= $(F90LIBS) $(LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
146 > OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
147  
148 < OOPSE_MPI_LDFLAGS= $(F90LIBS) $(MPI_LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
148 > OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(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