--- trunk/OOPSE-3.0/make/Makefile.in	2004/09/29 17:56:08	1508
+++ trunk/OOPSE-3.0/make/Makefile.in	2004/09/29 18:37:08	1510
@@ -34,6 +34,13 @@ Packages = \
 #
 #---------------------------------------------------------------------------
 
+#---------------------------------------------------------------------------
+#
+#  Packages
+#
+#---------------------------------------------------------------------------
+
+#packages to be made
 Packages = \
         utils \
         math \
@@ -51,6 +58,22 @@ Packages = \
         restraints \
         applications \
 
+#packages contain libraries
+PackageLibs = \
+	utils \
+	math \
+	types \
+	primitives \
+	visitors \
+	UseTheForce/DarkSide \
+	UseTheForce \
+	brains \
+	io \
+	integrators \
+	minimizers \
+	constraints \
+	profiling \
+	restraints \
 #---------------------------------------------------------------------------
 #
 #  Directories
@@ -174,7 +197,7 @@ LocalLibs        = $(subst /,,$(Packages))
 JavaPackageNames = $(subst /,.,$(JavaPackages))
 IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
 LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
-LocalLibs        = $(subst /,,$(Packages))
+LocalLibs        = $(subst /,,$(PackageLibs))
 LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
 
 
@@ -406,10 +429,12 @@ $(Executable) : $(ObjectFiles)
 # Executable
 $(Executable) : $(ObjectFiles)
 	$(Print) $@
+	$(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
 	$(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
 
 $(ParallelExecutable) : $(ParallelObjectFiles)
 	$(Print) $@
+	$(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
 	$(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
 
 # Anything else is just copied from source to target
@@ -459,21 +484,33 @@ $(DependencyFile) : $(DerivedSource)
 $(DependencyFile) : $(DerivedSource)
 	$(Print) $@ 
 	@cd $(PackageSourceDir)
-	touch Make.temp
-ifdef $(CppFiles)
-	$(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.temp
+
+	touch Make.ctemp
+	touch Make.ctemp
+
+ifneq "$(words $(CppFiles))" "0"
+	$(Print) Make dependencies for $(CppFiles)
+	$(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
+	$(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
+	cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
+	cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
 endif
-ifdef $(CFiles) 
-	$(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   >> Make.temp
+
+ifneq "$(words $(CFiles))" "0" 
+	$(Print) Make dependencies for $(CFiles)
+	$(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
+	$(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
+	cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
+	cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
+
 endif
-	cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
-	cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
-	echo $(F90Files)
-ifdef $(F90Files) 
+
+ifneq "$(words $(F90Files))" "0"
+	$(Print) Make dependencies for $(F90Files)
 	$(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
 	cat Make.ftemp >> $(DependencyFile)
 endif
-	$(Delete) Make.temp Make.ftemp
+	$(Delete) Make.cpptemp Make.ctemp Make.ftemp
 
 # make lib
 lib    : $(PackageListLoop)