--- trunk/OOPSE/src/Makefile.in	2004/01/14 15:49:26	942
+++ trunk/OOPSE/src/Makefile.in	2004/06/04 02:38:23	1233
@@ -36,15 +36,24 @@ SPRNG_INC=@SPRNG_INC@
 
 # SPRNG include path
 SPRNG_INC=@SPRNG_INC@
+  
+# Compile MPI code?
+USE_MPI=@USE_MPI@
 
-# MPICH library path
-MPI_LIBDIR=@MPI_LIBDIR@
+# MPI include path
+MPI_INC_DIR=@MPI_INC_DIR@
+                                                                                
+# MPI include path
+MPI_F90_INC=@MPI_F90_INC@
 
-# MPICH library
+# MPI library path
+MPI_LIB_DIR=@MPI_LIB_DIR@
+
+# MPI library
 MPI_LIB=@MPI_LIB@
 
-# MPICH include path
-MPI_INC=@MPI_INC@
+# MPI F90 library
+MPI_F90_LIB=@MPI_F90_LIB@
 
 # Location of yacc (or its substitution)
 YACC=@YACC@
@@ -122,7 +131,7 @@ MPI_INCLUDES= -I$(MPI_INC)  
 # include paths starting with "." are all relative to the SUBDIRS!!!
 
 INCLUDES= -I.. -I../../libBASS -I../../libmdtools
-MPI_INCLUDES= -I$(MPI_INC)  
+MPI_INCLUDES= -I$(MPI_INC_DIR)  
 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,7 +148,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) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
+OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIB_DIR) $(MPI_F90_LIB) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
 
 PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\" 
@@ -169,15 +178,19 @@ all : $(OOPSE) $(OOPSE_MPI)
 	obj \
 	MPIobj
 
+ifeq ($(USE_MPI),yes)
 all : $(OOPSE) $(OOPSE_MPI)
+else
+all : $(OOPSE)
+endif
 
 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