--- trunk/OOPSE/src/Makefile.in	2003/10/29 14:29:12	840
+++ 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@
 
@@ -145,7 +145,7 @@ OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBD
 
 OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
-OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) -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)\" 
@@ -180,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