Move test data from src/bin directories to data/.

diff --git a/bin/X86MAC64/matrix3DToEulerAngle b/bin/X86MAC64/matrix3DToEulerAngle
index 016266e..f444f3d 100755 (executable)
Binary files a/bin/X86MAC64/matrix3DToEulerAngle and b/bin/X86MAC64/matrix3DToEulerAngle differ

diff --git a/src/Tools/Test/dataAnalysis_kayabuki/src/X86MAC64/Makefile b/src/Tools/Test/dataAnalysis_kayabuki/src/X86MAC64/Makefile
index f938d74..ec61247 100755 (executable)
--- a/src/Tools/Test/dataAnalysis_kayabuki/src/X86MAC64/Makefile
+++ b/src/Tools/Test/dataAnalysis_kayabuki/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,47 +60,47 @@ 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 $@ ;  \
+               echo $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ;  \
+               $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ;  \
        fi
 
 
 $(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/matrix3D/matrix3DToEulerAngle/src/X86MAC64/matrix3DToEulerAngle b/src/Tools/matrix3D/matrix3DToEulerAngle/src/X86MAC64/matrix3DToEulerAngle
index 016266e..f444f3d 100755 (executable)
Binary files a/src/Tools/matrix3D/matrix3DToEulerAngle/src/X86MAC64/matrix3DToEulerAngle and b/src/Tools/matrix3D/matrix3DToEulerAngle/src/X86MAC64/matrix3DToEulerAngle differ