--- trunk/OOPSE-1.0/utils/Makefile.in	2004/07/19 21:58:37	1356
+++ trunk/OOPSE-1.0/utils/Makefile.in	2004/07/20 17:07:01	1359
@@ -53,9 +53,6 @@ F90LIBS = @F90LIBS@
 # Compiler dependent Fortran module
 F90LIBS = @F90LIBS@
 
-# Other libraries? (liberty)
-OTHERLIBS=@OTHERLIBS@
-
 # Location of yacc (or its substitution)
 YACC=@YACC@
 
@@ -114,17 +111,20 @@ LDFLAGS=@LDFLAGS@
 # LDFLAGS
 LDFLAGS=@LDFLAGS@
 
+# LIBOBJS
+LIBOBJS=@LIBOBJS@
+
 # First do compile-time flags:
 
 MPI_DECLARES= -DIS_MPI
 
 # include paths starting with "." are all relative to the SUBDIRS!!!
 
-INCLUDES= -I.. -I../../libBASS -I../../libmdtools -I../../third-party
+INCLUDES= -I.. -I../../libBASS -I../../libmdtools
 MPI_INCLUDES= $(MPI_INC) 
 CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
 CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
-DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) $(MPI_INCLUDES) -I../libBASS -I../libmdtools -I../../third-party
+DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
 MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
 
 QUICKLATE=quickLate$(EXE)
@@ -175,18 +175,20 @@ QUICK_C_OBJS :=	$(QUICK_C_FILES:.c=.o)
 #the objects
 
 DIR:=obj
-QUICK_C_OBJS :=	$(QUICK_C_FILES:.c=.o)
-QUICK_OBJS := $(QUICK_C_OBJS)
-DUMP2XYZ_C_OBJS :=$(DUMP2XYZ_C_FILES:.c=.o)
-DUMP2XYZ_CXX_OBJS :=$(DUMP2XYZ_CXX_FILES:.cpp=.o)
-DUMP2XYZ_OBJS := $(DUMP2XYZ_CXX_OBJS) $(DUMP2XYZ_C_OBJS)
+QUICK_C_OBJS      := $(QUICK_C_FILES:.c=.o)
+QUICK_OBJS        := $(QUICK_C_OBJS)
+DUMP2XYZ_C_OBJS   := $(DUMP2XYZ_C_FILES:.c=.o)
+DUMP2XYZ_CXX_OBJS := $(DUMP2XYZ_CXX_FILES:.cpp=.o)
+DUMP2XYZ_OBJS     := $(DUMP2XYZ_CXX_OBJS) $(DUMP2XYZ_C_OBJS)
+LIB_OBJS          := $(LIBOBJS:%.o=  $(DIR)/%.o)
 
 DIR:=MPIobj
-QUICK_C_MPIOBJS :=	$(QUICK_C_FILES:.c=.o)
-QUICK_MPIOBJS := $(QUICK_C_MPIOBJS)
-DUMP2XYZ_C_MPIOBJS :=	$(DUMP2XYZ_C_FILES:.c=.o)
+QUICK_C_MPIOBJS      :=	$(QUICK_C_FILES:.c=.o)
+QUICK_MPIOBJS        := $(QUICK_C_MPIOBJS)
+DUMP2XYZ_C_MPIOBJS   :=	$(DUMP2XYZ_C_FILES:.c=.o)
 DUMP2XYZ_CXX_MPIOBJS :=	$(DUMP2XYZ_CXX_FILES:.cpp=.o)
-DUMP2XYZ_MPIOBJS := $(DUMP2XYZ_C_MPIOBJS) $(DUMP2XYZ_CXX_MPIOBJS)
+DUMP2XYZ_MPIOBJS     := $(DUMP2XYZ_C_MPIOBJS) $(DUMP2XYZ_CXX_MPIOBJS)
+LIB_MPIOBJS          := $(LIBOBJS:%.o=  $(DIR)/%.o)
 
 LIBSUBDIRS = \
 	obj \
@@ -199,8 +201,8 @@ Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB
 quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
 	$(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(LDFLAGS) $(LDADD)
 
-Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB)
-	$(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) $(OTHERLIBS) -o $@ $(LDFLAGS) $(LDADD)
+Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB) $(LIB_OBJS)
+	$(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) $(LIB_OBJS) -o $@ $(LDFLAGS) $(LDADD)
 
 install : $(QUICKLATE) $(DUMP2XYZ)
 	$(MKINSTALLDIRS) $(OOPSE_HOME)/bin