Refresh Makefile.ocaml in objdir if it is modified in srcdir.

Patch by Erick Tryzelaar!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48149 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 685569a702d8d94d5b0572fe6abfb92bef6b6a88..e28ccf187aa494fe0d074e3e9207fda60d30fe47 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -159,7 +159,7 @@ endif
 #------------------------------------------------------------------------
 ifneq ($(PROJ_OBJ_DIR),$(PROJ_SRC_DIR))
 
 #------------------------------------------------------------------------
 ifneq ($(PROJ_OBJ_DIR),$(PROJ_SRC_DIR))
 

-Makefile: $(PROJ_SRC_DIR)/Makefile
+Makefile: $(PROJ_SRC_DIR)/Makefile $(ExtraMakefiles)

        $(Echo) "Updating Makefile"
        $(Verb) $(MKDIR) $(@D)
        $(Verb) $(CP) -f $< $@
        $(Echo) "Updating Makefile"
        $(Verb) $(MKDIR) $(@D)
        $(Verb) $(CP) -f $< $@


@@ -171,7 +171,7 @@ $(PROJ_OBJ_DIR)/Makefile% : $(PROJ_SRC_DIR)/Makefile%
        @case '$?' in \
           *Makefile.rules) ;; \
           *.in) ;; \
        @case '$?' in \
           *Makefile.rules) ;; \
           *.in) ;; \

-          *) $(Echo) "Updating $(@F)" ; \
+          *) $(EchoCmd) "Updating $(@F)" ; \

             $(MKDIR) $(@D) ; \
             $(CP) -f $< $@ ;; \
        esac
             $(MKDIR) $(@D) ; \
             $(CP) -f $< $@ ;; \
        esac

diff --git a/bindings/ocaml/Makefile b/bindings/ocaml/Makefile
index 5f1788e33ea4b988460687b3ca94f6927182e483..5ae6fe06d16dec586de63bd0d24a27b818532add 100644 (file)
--- a/bindings/ocaml/Makefile
+++ b/bindings/ocaml/Makefile
@@ -9,6 +9,7 @@
 
 LEVEL := ../..
 DIRS = llvm bitreader bitwriter analysis executionengine
 
 LEVEL := ../..
 DIRS = llvm bitreader bitwriter analysis executionengine

+ExtraMakefiles = $(PROJ_OBJ_DIR)/Makefile.ocaml

 
 ocamldoc:
        $(Verb) for i in $(DIRS) ; do \
 
 ocamldoc:
        $(Verb) for i in $(DIRS) ; do \