--- trunk/OOPSE-3.0/make/Makefile.in	2004/10/11 21:13:46	1557
+++ trunk/OOPSE-3.0/make/Makefile.in	2004/11/05 21:04:12	1715
@@ -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)