--- trunk/OOPSE/src/Makefile.in	2003/10/29 03:06:51	838
+++ trunk/OOPSE/src/Makefile.in	2004/05/10 20:28:14	1152
@@ -37,21 +37,21 @@ SPRNG_INC=@SPRNG_INC@
 # SPRNG include path
 SPRNG_INC=@SPRNG_INC@
 
-# MPICH library path
+# MPI library path
 MPI_LIBDIR=@MPI_LIBDIR@
 
-# MPICH library
+# MPI library
 MPI_LIB=@MPI_LIB@
 
-# MPICH include path
+# MPI F90 library
+MPI_F90LIB=@MPI_F90LIB@
+
+# MPI include path
 MPI_INC=@MPI_INC@
 
-# MPI F90 Module path
-MPI_F90_MODS=@MPI_F90_MODS@
+# MPI F90 include path
+MPI_F90INC=@MPI_F90INC@
 
-# MPI F90 libname
-MPIMODLIBNAME=@MPIMODLIBNAME@ 
-
 # Location of yacc (or its substitution)
 YACC=@YACC@
 
@@ -98,6 +98,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 +129,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)
 
@@ -139,8 +145,9 @@ OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(
 
 OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
-OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) $(MPI_LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
+OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPI_F90LIB) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
+
 PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\" 
 
 obj/%.o: %.cpp
@@ -173,10 +180,10 @@ oopse$(EXE) : $(OBJS) $(BASS_LIB) $(MD_LIB)
 depend: Make.dep
 
 oopse$(EXE) : $(OBJS) $(BASS_LIB) $(MD_LIB)
-	$(CXX) $(CFLAGS) $(OBJS) -g -o $@ $(OOPSE_LDFLAGS)
+	$(CXX) $(CFLAGS) $(OBJS) -o $@ $(OOPSE_LDFLAGS)
 
 oopse_MPI$(EXE) : $(MPIOBJS) $(BASS_MPI_LIB) $(MD_MPI_LIB)
-	$(CXX) $(CFLAGS) $(MPIOBJS) -g  -o $@ $(OOPSE_MPI_LDFLAGS)
+	$(CXX) $(CFLAGS) $(MPIOBJS) -o $@ $(OOPSE_MPI_LDFLAGS)
 
 install : $(OOPSE) $(OOPSE_MPI)
 	$(MKINSTALLDIRS) $(OOPSE_HOME)/bin