--- trunk/OOPSE-1.0/utils/Makefile.in	2004/07/19 16:32:46	1347
+++ trunk/OOPSE-1.0/utils/Makefile.in	2004/07/19 21:58:37	1356
@@ -30,13 +30,13 @@ SPRNG_LIBDIR=@SPRNG_LIBDIR@
 SAMPLE_SIM_DIR=@OOPSE_HOME@/share/samples/
 
 # SPRNG library path
-SPRNG_LIBDIR=@SPRNG_LIBDIR@
+SPRNG_LIB_DIR=@SPRNG_LIB_DIR@
 
 # SPRNG library
 SPRNG_LIB=@SPRNG_LIB@
 
 # SPRNG include path
-SPRNG_INC=@SPRNG_INC@
+SPRNG_INC_DIR=@SPRNG_INC_DIR@
 
 # MPICH library path
 MPI_LIBDIR=@MPI_LIBDIR@
@@ -53,6 +53,9 @@ F90LIBS = @F90LIBS@
 # Compiler dependent Fortran module
 F90LIBS = @F90LIBS@
 
+# Other libraries? (liberty)
+OTHERLIBS=@OTHERLIBS@
+
 # Location of yacc (or its substitution)
 YACC=@YACC@
 
@@ -121,7 +124,7 @@ DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) 
 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 -I../../third-party
+DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) $(MPI_INCLUDES) -I../libBASS -I../libmdtools -I../../third-party
 MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
 
 QUICKLATE=quickLate$(EXE)
@@ -134,7 +137,7 @@ LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG
 LIBS=$(BASS_LIB) $(MD_LIB)
 MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
 
-LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
+LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR)
 LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
 
 SRC_DIR := $(PWD)
@@ -142,16 +145,16 @@ obj/%.o: %.cpp
 PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\" 
 
 obj/%.o: %.cpp
-	cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
+	cd obj; $(CXX) $(CXXFLAGS) -c ../$<
 
 MPIobj/%.o: %.cpp
-	cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c $(SRC_DIR)/$<
+	cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$<
 
 obj/%.o: %.c
-	cd obj; $(CC) $(CFLAGS) -c $(SRC_DIR)/$<
+	cd obj; $(CC) $(CFLAGS) -c ../$<
 
 MPIobj/%.o: %.c
-	cd MPIobj; $(CC) $(MPI_CFLAGS) -c $(SRC_DIR)/$<
+	cd MPIobj; $(CC) $(MPI_CFLAGS) -c ../$<
 
 
 # quicklate files
@@ -197,7 +200,7 @@ Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB
 	$(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(LDFLAGS) $(LDADD)
 
 Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB)
-	$(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) -o $@ $(LDFLAGS) $(LDADD)
+	$(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) $(OTHERLIBS) -o $@ $(LDFLAGS) $(LDADD)
 
 install : $(QUICKLATE) $(DUMP2XYZ)
 	$(MKINSTALLDIRS) $(OOPSE_HOME)/bin