--- trunk/OOPSE/src/Makefile.in	2003/09/19 16:03:44	774
+++ trunk/OOPSE/src/Makefile.in	2003/10/29 14:29:12	840
@@ -49,12 +49,9 @@ MPI_F90_MODS=@MPI_F90_MODS@
 # MPI F90 Module path
 MPI_F90_MODS=@MPI_F90_MODS@
 
-# Compiler dependent Fortran module
-F_MACH_DEFS=@fortran_machine_defs@
+# MPI F90 libname
+MPIMODLIBNAME=@MPIMODLIBNAME@ 
 
-# Compiler dependent Fortran module
-FLIBS_EXTRA = @F90LIBS@
-
 # Location of yacc (or its substitution)
 YACC=@YACC@
 
@@ -71,6 +68,9 @@ F90=@F90@
 # F90 compiler
 F90=@F90@
 
+# F90 libraries (for linking with C)
+F90LIBS=@F90LIBS@
+
 # ar
 AR=@AR@
 
@@ -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@
 
@@ -107,6 +113,9 @@ FFLAGS_C=@FFLAGS@
 # Fortran flags
 FFLAGS_C=@FFLAGS@
 
+# Fortran90 flags
+F90FLAGS_C=@F90FLAGS@
+
 # LDFLAGS
 LDFLAGS=@LDFLAGS@
 
@@ -120,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)
 
@@ -131,13 +140,14 @@ LIBS=$(BASS_LIB) $(MD_LIB)
 BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a
 MD_LIB=$(TOP)/libmdtools/libmdtools.a
 MD_MPI_LIB=$(TOP)/libmdtools/libmdtools_MPI.a
-LIBS=$(BASS_LIB) $(MD_LIB)
-MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
+LIBS=$(MD_LIB) $(BASS_LIB)
+MPI_LIBS=$(MD_MPI_LIB) $(BASS_MPI_LIB)
 
-OOPSE_LDFLAGS=$(FLIBS) $(FLIBS_EXTRA) -L$(TOP)/libmdtools -lmdtools -L$(TOP)/libBASS -lBASS -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
+OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
-OOPSE_MPI_LDFLAGS=$(FLIBS) $(FLIBS_EXTRA) -L$(TOP)/libmdtools -lmdtools_MPI -L$(TOP)/libBASS -lBASS_MPI -L$(MPI_LIBDIR) -lmpichf90 -lmpich -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
+OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
 
+
 PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\" 
 
 obj/%.o: %.cpp
@@ -203,7 +213,7 @@ distclean : dummy
 	for i in $(LIBSUBDIRS); do \
 	  (cd $$i; $(RM) *.o) || exit 1; \
 	done
-	$(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp Make.dep
+	$(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp
 
 devclean : distclean