--- trunk/OOPSE/utils/Makefile.in	2003/09/05 21:28:52	747
+++ trunk/OOPSE/utils/Makefile.in	2003/09/25 16:42:34	785
@@ -51,7 +51,7 @@ FLIBS_EXTRA = @F90LIBS@
 MPI_F90_MODS=@MPI_F90_MODS@
 
 # Compiler dependent Fortran module
-FLIBS_EXTRA = @F90LIBS@
+F90LIBS = @F90LIBS@
 
 # Location of yacc (or its substitution)
 YACC=@YACC@
@@ -103,8 +103,11 @@ FFLAGS_C=@F90FLAGS@
 PREPDEFFLAG=@PREPDEFFLAG@
 
 # Fortran flags
-FFLAGS_C=@F90FLAGS@
+FFLAGS_C=@FFLAGS@
 
+# Fortran90 flags
+F90FLAGS_C=@F90FLAGS@
+
 # LDFLAGS
 LDFLAGS=@LDFLAGS@
 
@@ -115,7 +118,7 @@ MPI_INCLUDES= $(MPI_INC) $(MPI_INC)/mpi2c++ 
 # include paths starting with "." are all relative to the SUBDIRS!!!
 
 INCLUDES= -I.. -I../../libBASS -I../../libmdtools
-MPI_INCLUDES= $(MPI_INC) $(MPI_INC)/mpi2c++ 
+MPI_INCLUDES= $(MPI_INC) 
 CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
 CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
 DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
@@ -132,7 +135,7 @@ QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(FLIBS) $(FL
 MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
 
 QUICKLATE_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
-QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(FLIBS) $(FLIBS_EXTRA)
+QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
 
 SRC_DIR := $(PWD)
 
@@ -181,7 +184,7 @@ quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
 depend: Make.dep
 
 quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
-	$(CC) $(CFLAGS) $(QUICK_OBJS) -o $@@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD)
+	$(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD)
 
 install : $(QUICKLATE) 
 	$(MKINSTALLDIRS) $(OOPSE_HOME)/bin
@@ -209,7 +212,7 @@ distclean : dummy
 	for i in $(LIBSUBDIRS); do \
 	  (cd $$i; $(RM) *.o) || exit 1; \
 	done
-	$(RM) $(QUICKLATE) *.o *~ Make.temp Make.dep
+	$(RM) $(QUICKLATE) *.o *~ Make.temp
 
 devclean : distclean