Stirng.h -> eosString.h

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

diff --git a/src/Tools/mrcImage/mrcRefCorEstimate/src/Makefile b/src/Tools/mrcImage/mrcRefCorEstimate/src/Makefile
index 205e480..8c06a54 100755 (executable)
--- a/src/Tools/mrcImage/mrcRefCorEstimate/src/Makefile
+++ b/src/Tools/mrcImage/mrcRefCorEstimate/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
@@ -210,17 +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)
-       @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
        @echo ---- end of bin
 
 install-wish:
@@ -354,12 +357,13 @@ 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 ] ; \
@@ -384,6 +388,9 @@ depend::
 update:../Config/OptionControlFile
        maketool $(CLASSNAME) $(OBJECTNAME) update
 
+updateNoAns:../Config/OptionControlFile
+       maketool $(CLASSNAME) $(OBJECTNAME) update N
+
 changeName::
 
 Test:$(OSTYPE)/$(OBJECTNAME) TestDir
@@ -419,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