--- trunk/OOPSE-2.0/make/Makefile.in	2005/01/12 23:17:02	1932
+++ trunk/OOPSE-2.0/make/Makefile.in	2005/02/14 23:26:25	2023
@@ -49,12 +49,15 @@ PackageLibs = \
 	integrators\
 	constraints \
 	minimizers \
+	selection \
 
 #packages containing applications
 Applications = \
 	applications/oopse \
 	applications/dump2Xyz \
         applications/simpleBuilder\
+	applications/staticProps \
+	applications/dynamicProps \
 
 Samples = \
 	samples/argon \
@@ -123,7 +126,9 @@ Package          = $(subst $(shell cd $(SourceDir); pw
 # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
 #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
 #use shell script to get the absolute path and then rip it off from $(CurrentDir)
-Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
+#Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
+# REMINDER: We are now using the Package line in each subdir makefile.
+# This avoids the strange path problem and the subshell
 
 PackageList              = $(Package)
 PackageSourceDir         = $(SourceDir)/$(Package)
@@ -254,7 +259,7 @@ MkDir                = @MKINSTALLDIRS@
 INSTALL                = @INSTALL@
 InstallProgram         = @INSTALL_PROGRAM@
 InstallData            = @INSTALL_DATA@
-MkDir                = @MKINSTALLDIRS@
+MkDir                  = @MKINSTALLDIRS@
 Delete                 = rm -fr
 StaticArchiver         = @AR@
 DynamicArchiver        = @CC@
@@ -274,6 +279,8 @@ Doxygen                = @DOXYGEN@
 Lex                    = @LEX@
 Ranlib                 = @RANLIB@
 Doxygen                = @DOXYGEN@
+Ps                     = @PS@
+PsType                 = @PSTYPE@
 
 MakeOptions            = -k
 MakeDependOptions      = 
@@ -283,10 +290,10 @@ COptions               = $(FrcDeclare) @CFLAGS@
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
-COptions               = $(FrcDeclare) @CFLAGS@
+COptions               = $(FrcDeclare) @CFLAGS@ -DPS=$(Ps) -DPSTYPE=$(PsType)
 CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
-CppOptions             = $(FrcDeclare) @CXXFLAGS@
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
+CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
 FortranOptions         =
 F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) 
 F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
@@ -364,8 +371,11 @@ $(PackageTargetDir) :
 
 # Create target directory
 $(PackageTargetDir) :
-	$(MakeDir) $@
+	$(MkDir) $@
 
+$(BinDir) :
+	$(MkDir) $@
+
 # .c -> .o
 $(PackageTargetDir)/%.o : %.c
 	$(Print) $@
@@ -437,9 +447,9 @@ ifeq "$(UseMPI)" "yes"
         fi
 
 	$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
-        if test -n "`ls *.$(ModSuffix)`"; then\
-          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
-        fi
+	if test -n "`ls *.$(ModSuffix)`"; then\
+	  $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+	fi
 
 else
 %.o : %.F90
@@ -447,7 +457,6 @@ else
 	if test -n "`ls *.$(ModSuffix)`"; then\
           $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
         fi
-
 endif
 
 
@@ -567,11 +576,11 @@ $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
 	$(Ranlib) $(CombinedParallelStaticLib)
 
 # Executable
-$(Executable) : $(CombinedStaticLib) $(ObjectFiles)
-	$(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
+$(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
+	$(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
 
-$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
-	$(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
+$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
+	$(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
 
 # Anything else is just copied from source to target
 $(PackageTargetDir)/% : $(PackageSourceDir)/%