--- trunk/OOPSE-3.0/make/Makefile.in	2004/10/11 18:40:22	1554
+++ trunk/OOPSE-3.0/make/Makefile.in	2004/12/20 20:50:56	1899
@@ -46,11 +46,10 @@ PackageLibs = \
 	UseTheForce \
 	brains \
 	io \
-	integrators \
-	minimizers \
 	constraints \
 	profiling \
 	restraints \
+	minimizers \
 
 #packages containing applications
 Applications = \
@@ -285,10 +284,10 @@ COptions               = $(FrcDeclare)
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
-COptions               = $(FrcDeclare)
-CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
-CppOptions             = $(FrcDeclare)
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
+COptions               = $(FrcDeclare) @CFLAGS@
+CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
+CppOptions             = $(FrcDeclare) @CXXFLAGS@
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
 FortranOptions         =
 F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) 
 F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
@@ -421,34 +420,34 @@ $(PackageTargetDir)/%.o : %.F90
 # .F90 -> .o
 $(PackageTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
-	fi
+        if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 
 $(PackageParallelTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
-	fi
+        if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 
 ifeq "$(UseMPI)" "yes"
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
-	fi
+        if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 
 	$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
-	fi
+        if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 
 else
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
-	fi
+        if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 
 endif
 
@@ -652,38 +651,38 @@ ifneq "$(words $(CppFiles))" "0"
 	@cd $(PackageSourceDir)
 
 ifneq "$(words $(CppFiles))" "0"
-	$(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
-	@cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
+	@cat Make.cpptemp  >> $(DependencyFile)
 	$(Delete) Make.cpptemp
 
   ifeq "$(UseMPI)" "yes"
-	$(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
-	@cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
+	@cat Make.cpptemp  >> $(DependencyFile)
 	@$(Delete) Make.cpptemp
   endif
 
 endif
 
 ifneq "$(words $(CFiles))" "0" 
-	$(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
-	@cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
+	@cat Make.ctemp  >> $(DependencyFile)
 	$(Delete) Make.ctemp
 
   ifeq "$(UseMPI)" "yes"
-	$(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
-	@cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
+	@cat Make.ctemp  >> $(DependencyFile)
 	@$(Delete) Make.ctemp
   endif
 
 endif
 
 ifneq "$(words $(F90Files))" "0"
-	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
 	@cat Make.ftemp >> $(DependencyFile)
 	@$(Delete) Make.ftemp
 
   ifeq "$(UseMPI)" "yes"
-	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
 	@cat Make.ftemp >> $(DependencyFile)
 	@$(Delete) Make.ftemp
   endif