--- trunk/OOPSE/libmdtools/Makefile	2003/03/21 17:52:35	379
+++ trunk/OOPSE/libmdtools/Makefile	2003/03/21 20:37:58	385
@@ -12,7 +12,7 @@ DECLARES= -DFRC_PATH="$(OOPSE_HOME)/forcefields"
 
 # First do compile-time flags:
 
-DECLARES= -DFRC_PATH="$(OOPSE_HOME)/forcefields"
+DECLARES= -DFRC_PATH="$(FORCE_PARAM_DIR)"
 MPI_DECLARES= -DIS_MPI
 
 # include paths starting with "." are all relative to the SUBDIRS!!!
@@ -101,6 +101,7 @@ F90_SRCS :=	$(F90_FILES)
 C_SRCS   :=     $(C_FILES)
 CXX_SRCS :=	$(CXX_FILES)
 F90_SRCS :=	$(F90_FILES)
+SRCS     :=     $(C_SRCS) $(CXX_SRCS) $(F90_SRCS)
 
 DIR:=obj
 C_OBJS   :=     $(C_FILES:.c=.o)
@@ -144,19 +145,19 @@ distclean : dummy
 	for i in $(LIBSUBDIRS); do \
 	  (cd $$i; $(RM) *.o *.mod) || exit 1; \
 	done
-	$(RM) libmdtools.a libmdtools_MPI.a *.o *.mod *~ Make.temp Make.ftemp
+	$(RM) libmdtools.a libmdtools_MPI.a *.o *.mod *~ Make.temp Make.ftemp Make.dep
 
-Make.dep: depend
+depend : Make.dep
 
-depend :
+Make.dep : $(SRCS)
 	echo "Only C dependencies are made automagically!"
 	echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
 	$(CC) $(DEPFLAGS) -MM $(C_SRCS) $(CXX_SRCS) \
 		| sed 's/\.o:/\$$(O)\ :/g' > Make.temp
 	cat Make.temp | sed 's/^/obj\//' >> Make.dep
 	cat Make.temp | sed 's/^/MPIobj\//' >> Make.dep
-#	../utils/sfmakedepend -I $(MPI_F90_MODS) -d obj -f ./Make.ftemp -h *.F90
-#	../utils/sfmakedepend -I $(MPI_F90_MODS) -d MPIobj -f ./Make.ftemp -h *.F90
+#	../scripts/sfmakedepend -I $(MPI_F90_MODS) -d obj -f ./Make.ftemp -h *.F90
+#	../scripts/sfmakedepend -I $(MPI_F90_MODS) -d MPIobj -f ./Make.ftemp -h *.F90
 #	cat Make.ftemp | sed 's/\.o:/\$$(O)\ :/g' >> Make.dep
 	$(RM) Make.ftemp Make.temp
 
@@ -315,5 +316,3 @@ MPIobj/wrappers$(O): wrappers.F90 \
 	MPIobj/simulation_module$(O) \
 	MPIobj/atype_module$(O) \
 	MPIobj/do_Forces$(O) 
-
-