--- trunk/OOPSE-2.0/make/Makefile.in	2005/01/13 21:56:58	1940
+++ 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)
@@ -274,6 +279,8 @@ Doxygen                = @DOXYGEN@
 Lex                    = @LEX@
 Ranlib                 = @RANLIB@
 Doxygen                = @DOXYGEN@
+Ps                     = @PS@
+PsType                 = @PSTYPE@
 
 MakeOptions            = -k
 MakeDependOptions      = 
@@ -283,7 +290,7 @@ 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@ @OOPSE_TEMPLATE_FLAGS@
 CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@