Stirng.h -> eosString.h

[eos/base.git] / src / Tools / mrcImage / mrcImageCorrelation / src / Makefile

diff --git a/src/Tools/mrcImage/mrcImageCorrelation/src/Makefile b/src/Tools/mrcImage/mrcImageCorrelation/src/Makefile
index 510dc86..8c06a54 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageCorrelation/src/Makefile
+++ b/src/Tools/mrcImage/mrcImageCorrelation/src/Makefile
@@ -1,9 +1,9 @@
-include ../Config/Define.inc
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
+include ../../../Config/Define.inc                                              
+include ../../Config/Define.inc                                              
+include ../Config/Define.inc                                              
+include $(EOS_HOME)/src/Config/DefineTool.inc
 
-EOSHOME=../../../../../
+EOSHOME=$(EOS_HOME)
 DSTDIR=$(EOSHOME)/bin
 DSTDOC=$(EOSHOME)/doc
 DSTTAR=$(EOSHOME)/tar
@@ -58,29 +58,34 @@ REALMODULESDEBUG    = \
                        $(OSTYPE)/usage.debugo \
                        $(OSTYPE)/util.debugo 
 
-all: $(OSTYPE)/$(OBJECTNAME)
+
+all: $(OSTYPE)/$(OBJECTNAME) 
+       if [ ! -L $(OSTYPE) ] ; then \
+               moveHostdependent; \
+       fi
 
 debug: $(OSTYPE)/$(OBJECTNAME).debug
 
 cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb
 
+
 $(OSTYPE)/$(OBJECTNAME)::
-       @cd $(OSTYPE); \
-       $(RM) -f Makefile ; \
-       $(CP) ../../../../../Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile Makefile ; \
-       $(MAKE) $(OBJECTNAME)
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
+       cd $(OSTYPE); \
+       $(MAKE) $(OBJECTNAME)  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 $(OSTYPE)/$(OBJECTNAME).debug::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
-       $(RM) -f Makefile ; \
-       $(CP) ../../../../../Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile Makefile ; \
-       $(MAKE) $(OBJECTNAME).debug
+       $(MAKE) $(OBJECTNAME).debug  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 $(OSTYPE)/$(OBJECTNAME).cudagdb::
+       @$(RM) -f $(OSTYPE)/Makefile ; \
+       $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
-       $(RM) -f Makefile ; \
-       $(CP) ../../../../../Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile Makefile ; \
-       $(MAKE) $(OBJECTNAME).cudagdb
+       $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 cvsupdate::
        cvs -d $(EOS_CVSROOT) update -d 
@@ -205,18 +210,20 @@ install-bin:$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
 
 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME) 
        @echo ---- Installing to bin
+       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @if [ ! -d $(DSTDIR)/$(OSTYPE) ]; \
        then \
                mkdir $(DSTDIR)/$(OSTYPE); \
        fi
-       @if [ -x $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) ]; \
+       @if [ -x $(OSTYPE)/$(OBJECTNAME) ]; \
        then \
+               echo "Compilation is complete"; \
                $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+               $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) $(DSTDIR)/$(OSTYPE); \
+               $(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
+       else \
+               echo "Compilation is incomplete. $(OBJECTNAME)"; \
        fi
-       @$(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE)
-       @$(CHMOD) 555 $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @$(CHGRP) Eos $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -231,7 +238,6 @@ install-wish:
                $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/*  ;\
                touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
                $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
-               $(CHGRP) Eos $(DSTDIR)/wish/$(OBJECTNAME)/*;\
                echo "---- Tcl/Tk file Installed";\
        fi
 
@@ -245,7 +251,6 @@ install-ruby:
                fi ; \
                $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
                echo "---- Ruby/Tk file Installed"; \
        fi
 
@@ -259,7 +264,6 @@ install-perl:
                fi; \
                $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
-               $(CHGRP) Eos $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
                echo "---- Perl/Tk file Installed"; \
        fi
 
@@ -277,7 +281,6 @@ install-shell:
                fi ; \
                $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
                $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
-               $(CHGRP) Eos $(DSTDIR)/shell/$(OBJECTNAME)/*; \
                echo "---- Shell file Installed"; \
        fi
 
@@ -304,7 +307,6 @@ install-khoros:
                                $(RM) -f $(OBJECTNAME).pane ; \
                                $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
                                $(CD) ../../ ; \
-                               $(CHGRP) -R Eos $(OBJECTNAME); \
                                $(CHMOD) -R 555 $(OBJECTNAME); \
                        else \
                                echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
@@ -352,18 +354,16 @@ $(DSTDIR)/$(OBJECTNAME): $(OSTYPE)/$(OBJECTNAME)
 
 depend::
        @echo dependency checking now
-       @if [ ! -d $(OSTYPE) ] ; \
-       then \
-               mkdir $(OSTYPE); \
-       else \
-               rm -f $(OSTYPE)/.Depend ; \
+       @if [ ! -L $(OSTYPE) ] ; then \
+               moveHostdependent; \
        fi
+       rm -f $(OSTYPE)/.Depend 
        #echo C
        @if [ -f $(OBJECTNAME).c ] ; \
        then \
                echo "dependency: *.c"; \
                echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c   ; \
-                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c   > $(OSTYPE)/.Depend ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
@@ -388,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -423,5 +426,5 @@ tar::
                                                             ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
                                ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
 
-include $(OSTYPE)/.Depend
-include ../Config/Target.inc
+-include $(OSTYPE)/.Depend
+-include ../Config/Target.inc