Apply eosPThread to mrc2Dto3D, -pthread

Modify lmrcImageRhoFiltering
Modify x86Mac64.inc
Modify lmrcImageFFT for odd size images
Modify lmrcImageOperation(lmrcImageAdd) for speed up.

diff --git a/bin/X86MAC64/mrc2Dto3D b/bin/X86MAC64/mrc2Dto3D
index 684e04d..2e3862d 100755 (executable)
Binary files a/bin/X86MAC64/mrc2Dto3D and b/bin/X86MAC64/mrc2Dto3D differ

diff --git a/bin/X86MAC64/mrc3Dto2D b/bin/X86MAC64/mrc3Dto2D
index 052b260..518f04d 100755 (executable)
Binary files a/bin/X86MAC64/mrc3Dto2D and b/bin/X86MAC64/mrc3Dto2D differ

diff --git a/bin/X86MAC64/mrcImageFFT b/bin/X86MAC64/mrcImageFFT
index ecca9c0..d8dde68 100755 (executable)
Binary files a/bin/X86MAC64/mrcImageFFT and b/bin/X86MAC64/mrcImageFFT differ

diff --git a/lib/X86MAC64/libContour.debug.a b/lib/X86MAC64/libContour.debug.a
new file mode 100644 (file)
index 0000000..4be28fb
Binary files /dev/null and b/lib/X86MAC64/libContour.debug.a differ

diff --git a/lib/X86MAC64/libEosObjects.a b/lib/X86MAC64/libEosObjects.a
index 98a5866..c2a43c9 100644 (file)
Binary files a/lib/X86MAC64/libEosObjects.a and b/lib/X86MAC64/libEosObjects.a differ

diff --git a/lib/X86MAC64/libEosObjects.debug.a b/lib/X86MAC64/libEosObjects.debug.a
index 9acd6e7..643d60e 100644 (file)
Binary files a/lib/X86MAC64/libEosObjects.debug.a and b/lib/X86MAC64/libEosObjects.debug.a differ

diff --git a/lib/X86MAC64/libFile.a b/lib/X86MAC64/libFile.a
index 200d5a9..2b73be7 100644 (file)
Binary files a/lib/X86MAC64/libFile.a and b/lib/X86MAC64/libFile.a differ

diff --git a/lib/X86MAC64/libFile.debug.a b/lib/X86MAC64/libFile.debug.a
new file mode 100644 (file)
index 0000000..5c7f0b1
Binary files /dev/null and b/lib/X86MAC64/libFile.debug.a differ

diff --git a/lib/X86MAC64/libMATH.debug.a b/lib/X86MAC64/libMATH.debug.a
new file mode 100644 (file)
index 0000000..ecba6b4
Binary files /dev/null and b/lib/X86MAC64/libMATH.debug.a differ

diff --git a/lib/X86MAC64/libMatrix3D.a b/lib/X86MAC64/libMatrix3D.a
index 752f4dd..908b068 100644 (file)
Binary files a/lib/X86MAC64/libMatrix3D.a and b/lib/X86MAC64/libMatrix3D.a differ

diff --git a/lib/X86MAC64/libMatrix3D.debug.a b/lib/X86MAC64/libMatrix3D.debug.a
new file mode 100644 (file)
index 0000000..05c1d85
Binary files /dev/null and b/lib/X86MAC64/libMatrix3D.debug.a differ

diff --git a/lib/X86MAC64/libMemory.a b/lib/X86MAC64/libMemory.a
index 863184d..376848c 100644 (file)
Binary files a/lib/X86MAC64/libMemory.a and b/lib/X86MAC64/libMemory.a differ

diff --git a/lib/X86MAC64/libMemory.debug.a b/lib/X86MAC64/libMemory.debug.a
new file mode 100644 (file)
index 0000000..607b2f7
Binary files /dev/null and b/lib/X86MAC64/libMemory.debug.a differ

diff --git a/lib/X86MAC64/libString.debug.a b/lib/X86MAC64/libString.debug.a
new file mode 100644 (file)
index 0000000..0aa6d9d
Binary files /dev/null and b/lib/X86MAC64/libString.debug.a differ

diff --git a/lib/X86MAC64/libVector.a b/lib/X86MAC64/libVector.a
index 72cf7a8..f7078f3 100644 (file)
Binary files a/lib/X86MAC64/libVector.a and b/lib/X86MAC64/libVector.a differ

diff --git a/lib/X86MAC64/libVector.debug.a b/lib/X86MAC64/libVector.debug.a
new file mode 100644 (file)
index 0000000..fc41209
Binary files /dev/null and b/lib/X86MAC64/libVector.debug.a differ

diff --git a/lib/X86MAC64/libeosPThread.a b/lib/X86MAC64/libeosPThread.a
index e16abb8..566df8e 100644 (file)
Binary files a/lib/X86MAC64/libeosPThread.a and b/lib/X86MAC64/libeosPThread.a differ

diff --git a/lib/X86MAC64/libeosPThread.debug.a b/lib/X86MAC64/libeosPThread.debug.a
new file mode 100644 (file)
index 0000000..9ce0bcf
Binary files /dev/null and b/lib/X86MAC64/libeosPThread.debug.a differ

diff --git a/lib/X86MAC64/libmrcImage.a b/lib/X86MAC64/libmrcImage.a
index ef875b9..35556b9 100644 (file)
Binary files a/lib/X86MAC64/libmrcImage.a and b/lib/X86MAC64/libmrcImage.a differ

diff --git a/lib/X86MAC64/libmrcImage.debug.a b/lib/X86MAC64/libmrcImage.debug.a
index 0dfa179..898d9bb 100644 (file)
Binary files a/lib/X86MAC64/libmrcImage.debug.a and b/lib/X86MAC64/libmrcImage.debug.a differ

diff --git a/lib/X86MAC64/libpsFile.debug.a b/lib/X86MAC64/libpsFile.debug.a
new file mode 100644 (file)
index 0000000..afb9c72
Binary files /dev/null and b/lib/X86MAC64/libpsFile.debug.a differ

diff --git a/lib/X86MAC64/libtransform.a b/lib/X86MAC64/libtransform.a
index 05f8968..388d82e 100644 (file)
Binary files a/lib/X86MAC64/libtransform.a and b/lib/X86MAC64/libtransform.a differ

diff --git a/lib/X86MAC64/libtransform.debug.a b/lib/X86MAC64/libtransform.debug.a
new file mode 100644 (file)
index 0000000..d87adf8
Binary files /dev/null and b/lib/X86MAC64/libtransform.debug.a differ

diff --git a/lib/X86MAC64/shared/Vector.sharedo b/lib/X86MAC64/shared/Vector.sharedo
index d2716b9..b460542 100644 (file)
Binary files a/lib/X86MAC64/shared/Vector.sharedo and b/lib/X86MAC64/shared/Vector.sharedo differ

diff --git a/lib/X86MAC64/shared/VectorScalarProduct.sharedo b/lib/X86MAC64/shared/VectorScalarProduct.sharedo
index 8ed51df..4b98df6 100644 (file)
Binary files a/lib/X86MAC64/shared/VectorScalarProduct.sharedo and b/lib/X86MAC64/shared/VectorScalarProduct.sharedo differ

diff --git a/lib/X86MAC64/shared/fileInfo.sharedo b/lib/X86MAC64/shared/fileInfo.sharedo
index 1dd304b..ce3cfe2 100644 (file)
Binary files a/lib/X86MAC64/shared/fileInfo.sharedo and b/lib/X86MAC64/shared/fileInfo.sharedo differ

diff --git a/lib/X86MAC64/shared/fileInit.sharedo b/lib/X86MAC64/shared/fileInit.sharedo
index 6bc9442..0d566f4 100644 (file)
Binary files a/lib/X86MAC64/shared/fileInit.sharedo and b/lib/X86MAC64/shared/fileInit.sharedo differ

diff --git a/lib/X86MAC64/shared/fileOpen.sharedo b/lib/X86MAC64/shared/fileOpen.sharedo
index 1eea087..b0e9024 100644 (file)
Binary files a/lib/X86MAC64/shared/fileOpen.sharedo and b/lib/X86MAC64/shared/fileOpen.sharedo differ

diff --git a/lib/X86MAC64/shared/lVectorSpline2D.sharedo b/lib/X86MAC64/shared/lVectorSpline2D.sharedo
index 07969de..e63109c 100644 (file)
Binary files a/lib/X86MAC64/shared/lVectorSpline2D.sharedo and b/lib/X86MAC64/shared/lVectorSpline2D.sharedo differ

diff --git a/lib/X86MAC64/shared/lmrc2Dto3D.sharedo b/lib/X86MAC64/shared/lmrc2Dto3D.sharedo
index e5dbd44..7c453f3 100644 (file)
Binary files a/lib/X86MAC64/shared/lmrc2Dto3D.sharedo and b/lib/X86MAC64/shared/lmrc2Dto3D.sharedo differ

diff --git a/lib/X86MAC64/shared/lmrc3Dto2D.sharedo b/lib/X86MAC64/shared/lmrc3Dto2D.sharedo
index a1737a6..0ac1438 100644 (file)
Binary files a/lib/X86MAC64/shared/lmrc3Dto2D.sharedo and b/lib/X86MAC64/shared/lmrc3Dto2D.sharedo differ

diff --git a/lib/X86MAC64/shared/lmrcImageFFT.sharedo b/lib/X86MAC64/shared/lmrcImageFFT.sharedo
index 449de79..e551b89 100755 (executable)
Binary files a/lib/X86MAC64/shared/lmrcImageFFT.sharedo and b/lib/X86MAC64/shared/lmrcImageFFT.sharedo differ

diff --git a/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo b/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo
index 9640941..3b93d6b 100644 (file)
Binary files a/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo and b/lib/X86MAC64/shared/lmrcImageRhoFiltering.sharedo differ

diff --git a/lib/X86MAC64/shared/mrcImageOperation.sharedo b/lib/X86MAC64/shared/mrcImageOperation.sharedo
index eac93a9..5a10b94 100644 (file)
Binary files a/lib/X86MAC64/shared/mrcImageOperation.sharedo and b/lib/X86MAC64/shared/mrcImageOperation.sharedo differ

diff --git a/lib/X86MAC64/shared/mrcImageSectionGet.sharedo b/lib/X86MAC64/shared/mrcImageSectionGet.sharedo
index e4345c9..6a02eb5 100644 (file)
Binary files a/lib/X86MAC64/shared/mrcImageSectionGet.sharedo and b/lib/X86MAC64/shared/mrcImageSectionGet.sharedo differ

diff --git a/src/Objects/DataExpress/Contour/src/X86MAC64/libContour.debug.a b/src/Objects/DataExpress/Contour/src/X86MAC64/libContour.debug.a
index 0cb8b89..4be28fb 100644 (file)
Binary files a/src/Objects/DataExpress/Contour/src/X86MAC64/libContour.debug.a and b/src/Objects/DataExpress/Contour/src/X86MAC64/libContour.debug.a differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
index ef875b9..53c2657 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
index cf95ad7..898d9bb 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo
index 449de79..e551b89 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFFT.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo
index 9640941..3b93d6b 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageRhoFiltering.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo b/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo
index eac93a9..5a10b94 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo b/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo
index e4345c9..6a02eb5 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageSectionGet.sharedo differ

diff --git a/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a b/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a
index 05f8968..388d82e 100644 (file)
Binary files a/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a and b/src/Objects/DataManip/transform/src/X86MAC64/libtransform.a differ

diff --git a/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a b/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a
index 3bcdcfa..d87adf8 100644 (file)
Binary files a/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a and b/src/Objects/DataManip/transform/src/X86MAC64/libtransform.debug.a differ

diff --git a/src/Objects/DataManip/transform/src/X86MAC64/lmrc2Dto3D.sharedo b/src/Objects/DataManip/transform/src/X86MAC64/lmrc2Dto3D.sharedo
index e5dbd44..7c453f3 100644 (file)
Binary files a/src/Objects/DataManip/transform/src/X86MAC64/lmrc2Dto3D.sharedo and b/src/Objects/DataManip/transform/src/X86MAC64/lmrc2Dto3D.sharedo differ

diff --git a/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo b/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo
index a1737a6..0ac1438 100644 (file)
Binary files a/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo and b/src/Objects/DataManip/transform/src/X86MAC64/lmrc3Dto2D.sharedo differ

diff --git a/src/Objects/General/File/src/X86MAC64/.Depend b/src/Objects/General/File/src/X86MAC64/.Depend
new file mode 100644 (file)
index 0000000..49cfa28
--- /dev/null
+++ b/src/Objects/General/File/src/X86MAC64/.Depend
@@ -0,0 +1,55 @@
+fileInfo.o: fileInfo.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /usr/include/math.h ../inc/File.h \
+  /Applications/Eos.app/Eos/include/String.h
+fileInit.o: fileInit.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h ../inc/File.h
+fileOpen.o: fileOpen.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h \
+  /Applications/Eos.app/Eos/include/string.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h ../inc/File.h

diff --git a/src/Objects/General/File/src/X86MAC64/.Source b/src/Objects/General/File/src/X86MAC64/.Source
new file mode 100644 (file)
index 0000000..c0503e2
--- /dev/null
+++ b/src/Objects/General/File/src/X86MAC64/.Source
@@ -0,0 +1,46 @@
+SRC = \
+fileInfo.c \
+fileInit.c \
+fileOpen.c \
+
+OBJ = \
+fileInfo.o \
+fileInit.o \
+fileOpen.o \
+
+SHAREDOBJ = \
+fileInfo.sharedo \
+fileInit.sharedo \
+fileOpen.sharedo \
+
+REALOBJ = \
+X86MAC64/fileInfo.o \
+X86MAC64/fileInit.o \
+X86MAC64/fileOpen.o \
+
+REALSHAREDOBJ = \
+X86MAC64/fileInfo.sharedo \
+X86MAC64/fileInit.sharedo \
+X86MAC64/fileOpen.sharedo \
+
+OBJDEBUG = \
+fileInfo.debugo \
+fileInit.debugo \
+fileOpen.debugo \
+
+REALOBJDEBUG = \
+X86MAC64/fileInfo.debugo \
+X86MAC64/fileInit.debugo \
+X86MAC64/fileOpen.debugo \
+
+OBJCUDAGDB = \
+fileInfo.cudagdb.o \
+fileInit.cudagdb.o \
+fileOpen.cudagdb.o \
+
+REALOBJCUDAGDB = \
+X86MAC64/fileInfo.cudagdb.o \
+X86MAC64/fileInit.cudagdb.o \
+X86MAC64/fileOpen.cudagdb.o \
+
+

diff --git a/src/Objects/General/File/src/X86MAC64/Makefile b/src/Objects/General/File/src/X86MAC64/Makefile
new file mode 100755 (executable)
index 0000000..28e9069
--- /dev/null
+++ b/src/Objects/General/File/src/X86MAC64/Makefile
@@ -0,0 +1,34 @@
+SHELL=/bin/ksh
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineObject.inc
+
+include .Source
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.CHeader
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.CCHeader
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.Wish
+
+LIBNAME=lib$(OBJECTNAME).a
+SHAREDLIB=lib$(OBJECTNAME).so
+LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
+LIBNAMECUDAGDB=lib$(OBJECTNAME).cudagdb.a
+
+$(LIBNAME): $(OBJ)
+       @echo LIBNAME:$(LIBNAME)
+       $(AR) rs $(LIBNAME) $(OBJ)
+
+$(SHAREDLIB): $(SHAREDOBJ)
+       @COMPILEDOBJ=`ls $(SHAREDOBJ)` ; echo "#### Compiled Objects"; echo $${COMPILEDOBJ};  echo "################"; \
+       $(SHARED) $(SHAREDLIB) $${COMPILEDOBJ} 
+
+$(LIBNAMEDEBUG): $(OBJDEBUG)
+       @echo LIBNAME:$(LIBNAMEDEBUG)
+       $(AR) rs $(LIBNAMEDEBUG) $(OBJDEBUG)
+
+$(LIBNAMECUDAGDB): $(OBJCUDAGDB)
+       @echo LIBNAME:$(LIBNAMECUDAGDB)
+       $(AR) rs $(LIBNAMECUDAGDB) $(OBJCUDAGDB)
+
+include .Depend
+

diff --git a/src/Objects/General/File/src/X86MAC64/fileInfo.sharedo b/src/Objects/General/File/src/X86MAC64/fileInfo.sharedo
new file mode 100644 (file)
index 0000000..ce3cfe2
Binary files /dev/null and b/src/Objects/General/File/src/X86MAC64/fileInfo.sharedo differ

diff --git a/src/Objects/General/File/src/X86MAC64/fileInit.sharedo b/src/Objects/General/File/src/X86MAC64/fileInit.sharedo
new file mode 100644 (file)
index 0000000..0d566f4
Binary files /dev/null and b/src/Objects/General/File/src/X86MAC64/fileInit.sharedo differ

diff --git a/src/Objects/General/File/src/X86MAC64/fileOpen.sharedo b/src/Objects/General/File/src/X86MAC64/fileOpen.sharedo
new file mode 100644 (file)
index 0000000..b0e9024
Binary files /dev/null and b/src/Objects/General/File/src/X86MAC64/fileOpen.sharedo differ

diff --git a/src/Objects/General/File/src/X86MAC64/libFile.a b/src/Objects/General/File/src/X86MAC64/libFile.a
new file mode 100644 (file)
index 0000000..2b73be7
Binary files /dev/null and b/src/Objects/General/File/src/X86MAC64/libFile.a differ

diff --git a/src/Objects/General/File/src/X86MAC64/libFile.debug.a b/src/Objects/General/File/src/X86MAC64/libFile.debug.a
new file mode 100644 (file)
index 0000000..5c7f0b1
Binary files /dev/null and b/src/Objects/General/File/src/X86MAC64/libFile.debug.a differ

diff --git a/src/Objects/General/Matrix3D/src/X86MAC64/libMatrix3D.a b/src/Objects/General/Matrix3D/src/X86MAC64/libMatrix3D.a
index 752f4dd..908b068 100644 (file)
Binary files a/src/Objects/General/Matrix3D/src/X86MAC64/libMatrix3D.a and b/src/Objects/General/Matrix3D/src/X86MAC64/libMatrix3D.a differ

diff --git a/src/Objects/General/Memory/src/X86MAC64/libMemory.a b/src/Objects/General/Memory/src/X86MAC64/libMemory.a
index 863184d..376848c 100644 (file)
Binary files a/src/Objects/General/Memory/src/X86MAC64/libMemory.a and b/src/Objects/General/Memory/src/X86MAC64/libMemory.a differ

diff --git a/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a b/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a
index 0d1f5ed..607b2f7 100644 (file)
Binary files a/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a and b/src/Objects/General/Memory/src/X86MAC64/libMemory.debug.a differ

diff --git a/src/Objects/General/Vector/src/X86MAC64/.Depend b/src/Objects/General/Vector/src/X86MAC64/.Depend
index 0fd1321..6464323 100644 (file)
--- a/src/Objects/General/Vector/src/X86MAC64/.Depend
+++ b/src/Objects/General/Vector/src/X86MAC64/.Depend
@@ -1,18 +1,18 @@
-X86MAC64/Vector.o:Vector.o
-X86MAC64/VectorScalarProduct.o:VectorScalarProduct.o
-X86MAC64/lVectorSpline2D.o:lVectorSpline2D.o
-Vector.o: Vector.c /usr/include/stdio.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/math.h /usr/include/architecture/i386/math.h \
-  /Users/tacyas/Eos/include/Memory.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/syslimits.h \
+Vector.o: Vector.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/math.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h /usr/include/stdlib.h \
-  /usr/include/Availability.h /usr/include/AvailabilityInternal.h \
   /usr/include/sys/wait.h /usr/include/sys/signal.h \
   /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
   /usr/include/i386/signal.h /usr/include/i386/_structs.h \
@@ -23,12 +23,22 @@ Vector.o: Vector.c /usr/include/stdio.h /usr/include/_types.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/Vector.h
+VectorRead.o: VectorRead.c /Applications/Eos.app/Eos/include/String.h \
+  /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /Applications/Eos.app/Eos/include/File.h \
+  ../inc/Vector.h
 VectorScalarProduct.o: VectorScalarProduct.c /usr/include/stdio.h \
-  /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
   /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
   /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/Availability.h /usr/include/AvailabilityInternal.h \
   /usr/include/sys/wait.h /usr/include/sys/signal.h \
   /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
   /usr/include/i386/signal.h /usr/include/i386/_structs.h \
@@ -42,7 +52,8 @@ VectorScalarProduct.o: VectorScalarProduct.c /usr/include/stdio.h \
 lVectorSpline2D.o: lVectorSpline2D.c /usr/include/stdlib.h \
   /usr/include/Availability.h /usr/include/AvailabilityInternal.h \
   /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+  /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/machine/_types.h \
   /usr/include/i386/_types.h /usr/include/sys/wait.h \
   /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
   /usr/include/machine/signal.h /usr/include/i386/signal.h \
@@ -55,10 +66,11 @@ lVectorSpline2D.o: lVectorSpline2D.c /usr/include/stdlib.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h /usr/include/stdio.h \
   /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/math.h /usr/include/architecture/i386/math.h \
-  /Users/tacyas/Eos/include/Memory.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin10/4.2.1/include/syslimits.h \
+  /usr/include/math.h /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h ../inc/Vector.h

diff --git a/src/Objects/General/Vector/src/X86MAC64/.Source b/src/Objects/General/Vector/src/X86MAC64/.Source
index c7b0b3b..588bae2 100644 (file)
--- a/src/Objects/General/Vector/src/X86MAC64/.Source
+++ b/src/Objects/General/Vector/src/X86MAC64/.Source
@@ -1,45 +1,54 @@
 SRC = \
 Vector.c \
+VectorRead.c \
 VectorScalarProduct.c \
 lVectorSpline2D.c \
 
 OBJ = \
 Vector.o \
+VectorRead.o \
 VectorScalarProduct.o \
 lVectorSpline2D.o \
 
 SHAREDOBJ = \
 Vector.sharedo \
+VectorRead.sharedo \
 VectorScalarProduct.sharedo \
 lVectorSpline2D.sharedo \
 
 REALOBJ = \
 X86MAC64/Vector.o \
+X86MAC64/VectorRead.o \
 X86MAC64/VectorScalarProduct.o \
 X86MAC64/lVectorSpline2D.o \
 
 REALSHAREDOBJ = \
 X86MAC64/Vector.sharedo \
+X86MAC64/VectorRead.sharedo \
 X86MAC64/VectorScalarProduct.sharedo \
 X86MAC64/lVectorSpline2D.sharedo \
 
 OBJDEBUG = \
 Vector.debugo \
+VectorRead.debugo \
 VectorScalarProduct.debugo \
 lVectorSpline2D.debugo \
 
 REALOBJDEBUG = \
 X86MAC64/Vector.debugo \
+X86MAC64/VectorRead.debugo \
 X86MAC64/VectorScalarProduct.debugo \
 X86MAC64/lVectorSpline2D.debugo \
 
 OBJCUDAGDB = \
 Vector.cudagdb.o \
+VectorRead.cudagdb.o \
 VectorScalarProduct.cudagdb.o \
 lVectorSpline2D.cudagdb.o \
 
 REALOBJCUDAGDB = \
 X86MAC64/Vector.cudagdb.o \
+X86MAC64/VectorRead.cudagdb.o \
 X86MAC64/VectorScalarProduct.cudagdb.o \
 X86MAC64/lVectorSpline2D.cudagdb.o \
 

diff --git a/src/Objects/General/Vector/src/X86MAC64/Makefile b/src/Objects/General/Vector/src/X86MAC64/Makefile
index f6815ee..28e9069 100755 (executable)
--- a/src/Objects/General/Vector/src/X86MAC64/Makefile
+++ b/src/Objects/General/Vector/src/X86MAC64/Makefile
@@ -1,13 +1,13 @@
 SHELL=/bin/ksh
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
-include ../../../../../Config/DefineObject.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineObject.inc
 
 include .Source
-include ../.CHeader
-include ../.CCHeader
-include ../.Wish
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.CHeader
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.CCHeader
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.Wish
 
 LIBNAME=lib$(OBJECTNAME).a
 SHAREDLIB=lib$(OBJECTNAME).so

diff --git a/src/Objects/General/Vector/src/X86MAC64/Vector.sharedo b/src/Objects/General/Vector/src/X86MAC64/Vector.sharedo
index d2716b9..b460542 100644 (file)
Binary files a/src/Objects/General/Vector/src/X86MAC64/Vector.sharedo and b/src/Objects/General/Vector/src/X86MAC64/Vector.sharedo differ

diff --git a/src/Objects/General/Vector/src/X86MAC64/VectorScalarProduct.sharedo b/src/Objects/General/Vector/src/X86MAC64/VectorScalarProduct.sharedo
index 8ed51df..4b98df6 100644 (file)
Binary files a/src/Objects/General/Vector/src/X86MAC64/VectorScalarProduct.sharedo and b/src/Objects/General/Vector/src/X86MAC64/VectorScalarProduct.sharedo differ

diff --git a/src/Objects/General/Vector/src/X86MAC64/lVectorSpline2D.sharedo b/src/Objects/General/Vector/src/X86MAC64/lVectorSpline2D.sharedo
index 07969de..e63109c 100644 (file)
Binary files a/src/Objects/General/Vector/src/X86MAC64/lVectorSpline2D.sharedo and b/src/Objects/General/Vector/src/X86MAC64/lVectorSpline2D.sharedo differ

diff --git a/src/Objects/General/Vector/src/X86MAC64/libVector.a b/src/Objects/General/Vector/src/X86MAC64/libVector.a
index 72cf7a8..f7078f3 100644 (file)
Binary files a/src/Objects/General/Vector/src/X86MAC64/libVector.a and b/src/Objects/General/Vector/src/X86MAC64/libVector.a differ

diff --git a/src/Objects/General/Vector/src/X86MAC64/libVector.debug.a b/src/Objects/General/Vector/src/X86MAC64/libVector.debug.a
new file mode 100644 (file)
index 0000000..fc41209
Binary files /dev/null and b/src/Objects/General/Vector/src/X86MAC64/libVector.debug.a differ

diff --git a/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a b/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a
index e16abb8..566df8e 100644 (file)
Binary files a/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a and b/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.a differ

diff --git a/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a b/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a
index 107e9a1..9ce0bcf 100644 (file)
Binary files a/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a and b/src/Objects/General/eosPThread/src/X86MAC64/libeosPThread.debug.a differ

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/Makefile b/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/Makefile
index f938d74..2a9beb5 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/Makefile
+++ b/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/Makefile
@@ -1,7 +1,7 @@
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
-include ../../../../../Config/DefineTool.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
 LIBFILES   = \
                        $(LIBPREFIX)EosObjects$(LIBSUFFIX) 
@@ -60,23 +60,23 @@ REALMODULESDEBUG    = \
 
 
 $(OBJECTNAME): $(MODULES) $(LIBFILES)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
        then \
                echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
        fi
-       @if [ -f ../$(OBJECTNAME).cc ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
        then \
                echo $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).ccm ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
        then \
                echo "MICO"; \
                echo $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
                echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
@@ -84,23 +84,23 @@ $(OBJECTNAME): $(MODULES) $(LIBFILES)
 
 
 $(OBJECTNAME).debug: $(MODULESDEBUG) $(LIBFILESDEBUG)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
        then \
                echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
        fi
-       @if [ -f ../$(OBJECTNAME).cc ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
        then \
                echo $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).ccm ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
        then \
                echo "MICO"; \
                echo $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
                echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
@@ -111,4 +111,4 @@ $(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG)
        $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@
 
 include ./.Depend
-include ../../Config/Target.inc
+include  $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/mrcImageFFT b/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/mrcImageFFT
index ecca9c0..d8dde68 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/mrcImageFFT and b/src/Tools/mrcImage/mrcImageFFT/src/X86MAC64/mrcImageFFT differ

diff --git a/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/.Depend b/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/.Depend
index 9847deb..6911a1a 100644 (file)
--- a/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/.Depend
+++ b/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/.Depend
@@ -1,32 +1,134 @@
-usage.o: usage.c /usr/include/stdio.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/stdlib.h /usr/include/Availability.h \
-  /usr/include/AvailabilityInternal.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
+argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc2Dto3D.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h
+init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc2Dto3D.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/File.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h
+mrc2Dto3D.o: mrc2Dto3D.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/machine/types.h /usr/include/i386/types.h \
+  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc2Dto3D.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/genUtil.h \
+  /Applications/Eos.app/Eos/include/ctfInfo.h \
+  /Applications/Eos.app/Eos/include/Vector.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/Array.h \
+  /Applications/Eos.app/Eos/include/Matrix3D.h \
+  /Applications/Eos.app/Eos/include/lmrcImageRhoFiltering.h \
+  /Applications/Eos.app/Eos/include/mrcImage.h \
+  /Applications/Eos.app/Eos/include/lmrc2Dto3D.h \
+  /Applications/Eos.app/Eos/include/Memory.h \
+  /Applications/Eos.app/Eos/include/String.h \
+  /Applications/Eos.app/Eos/include/lmrcImageRhoFiltering.h \
+  /Applications/Eos.app/Eos/include/lmrcImageMultiplying.h \
+  /Applications/Eos.app/Eos/include/lmrc3Dto2D.h
+usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/config.h ../inc/../inc/mrc2Dto3D.h
-util.o: util.c /usr/include/stdio.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
-  /usr/include/stdlib.h /usr/include/Availability.h \
-  /usr/include/AvailabilityInternal.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
+util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/secure/_stdio.h \
+  /usr/include/secure/_common.h /usr/include/stdlib.h \
+  /usr/include/sys/wait.h /usr/include/sys/signal.h \
+  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
+  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
   /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
   /usr/include/machine/types.h /usr/include/i386/types.h \
   /usr/include/i386/_types.h ../inc/config.h ../inc/../inc/mrc2Dto3D.h

diff --git a/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/Makefile b/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/Makefile
index f938d74..2a9beb5 100755 (executable)
--- a/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/Makefile
+++ b/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/Makefile
@@ -1,7 +1,7 @@
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
-include ../../../../../Config/DefineTool.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
 LIBFILES   = \
                        $(LIBPREFIX)EosObjects$(LIBSUFFIX) 
@@ -60,23 +60,23 @@ REALMODULESDEBUG    = \
 
 
 $(OBJECTNAME): $(MODULES) $(LIBFILES)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
        then \
                echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
        fi
-       @if [ -f ../$(OBJECTNAME).cc ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
        then \
                echo $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).ccm ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
        then \
                echo "MICO"; \
                echo $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
                echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
@@ -84,23 +84,23 @@ $(OBJECTNAME): $(MODULES) $(LIBFILES)
 
 
 $(OBJECTNAME).debug: $(MODULESDEBUG) $(LIBFILESDEBUG)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
        then \
                echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
        fi
-       @if [ -f ../$(OBJECTNAME).cc ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
        then \
                echo $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).ccm ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
        then \
                echo "MICO"; \
                echo $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
                $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
        fi
-       @if [ -f ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
                echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
                $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
@@ -111,4 +111,4 @@ $(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG)
        $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@
 
 include ./.Depend
-include ../../Config/Target.inc
+include  $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc

diff --git a/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D b/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D
index 684e04d..2e3862d 100755 (executable)
Binary files a/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D and b/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D differ

diff --git a/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D b/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D
index ad5574f..518f04d 100755 (executable)
Binary files a/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D and b/src/Tools/rec3d/mrc3Dto2D/src/X86MAC64/mrc3Dto2D differ