--- trunk/OOPSE/src/Makefile.in	2003/09/25 16:42:34	785
+++ trunk/OOPSE/src/Makefile.in	2004/01/14 15:49:26	942
@@ -46,12 +46,6 @@ MPI_INC=@MPI_INC@
 # MPICH include path
 MPI_INC=@MPI_INC@
 
-# MPI F90 Module path
-MPI_F90_MODS=@MPI_F90_MODS@
-
-# MPI F90 libname
-MPIMODLIBNAME=@MPIMODLIBNAME@ 
-
 # Location of yacc (or its substitution)
 YACC=@YACC@
 
@@ -98,6 +92,12 @@ CXXFLAGS_C=@CXXFLAGS@
 # C++ flags
 CXXFLAGS_C=@CXXFLAGS@
 
+# C++ template flags
+OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
+
+# C++ namespace flag
+EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
+
 # Preprocessor flag for fortran
 PREPFLAG=@PREPFLAG@
 
@@ -123,7 +123,7 @@ CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
 
 INCLUDES= -I.. -I../../libBASS -I../../libmdtools
 MPI_INCLUDES= -I$(MPI_INC)  
-CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
+CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
 DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
 MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
 
@@ -137,10 +137,11 @@ OOPSE_LDFLAGS= $(F90LIBS) $(LIBS) -L$(SPRNG_LIBDIR) $(
 LIBS=$(MD_LIB) $(BASS_LIB)
 MPI_LIBS=$(MD_MPI_LIB) $(BASS_MPI_LIB)
 
-OOPSE_LDFLAGS= $(F90LIBS) $(LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
+OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
-OOPSE_MPI_LDFLAGS= $(F90LIBS) $(MPI_LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
+OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
+
 PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\" 
 
 obj/%.o: %.cpp