From: George Rhoten <grhoten@users.noreply.github.com>
Date: Thu, 9 Aug 2012 22:36:57 +0000 (+0000)
Subject: ICU-9456 Apparently C and C++ generate the dependencies differently. Update the ... 
X-Git-Tag: milestone-59-0-1~3675
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81a751e0d28905cc984dbb039dd0914968578c58;p=icu

ICU-9456 Apparently C and C++ generate the dependencies differently. Update the .d generation accordingly.

X-SVN-Rev: 32144
---

diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin
index 0d47157c2ae..3643203fff7 100644
--- a/icu4c/source/config/mh-darwin
+++ b/icu4c/source/config/mh-darwin
@@ -51,11 +51,9 @@ STATIC_O = ao
 # Make sure that both the static and dynamic intermediate objects
 # get dependency checking
 ifneq ($(ENABLE_STATIC),)
-ifneq ($(ENABLE_DYNAMIC),)
 	STATIC_DEPENDENCY_FILE=" $*.$(STATIC_O)"
-	DYNAMIC_DEPENDENCY_FILE=" $*.o"
-endif
 endif
+	DYNAMIC_DEPENDENCY_FILE=" $*.o"
 
 ## Override Versioned target for a shared library.
 FINAL_SO_TARGET=  $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
@@ -63,14 +61,14 @@ MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
 
 ## Compilation and dependency rules
 %.$(STATIC_O): $(srcdir)/%.c
-	$(SILENT_COMPILE)$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d$(DYNAMIC_DEPENDENCY_FILE)" -o $@ $<
+	$(SILENT_COMPILE)$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE) -o $@ $<
 %.o: $(srcdir)/%.c
-	$(SILENT_COMPILE)$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d$(STATIC_DEPENDENCY_FILE)" -o $@ $<
+	$(SILENT_COMPILE)$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d"$(STATIC_DEPENDENCY_FILE) -o $@ $<
 
 %.$(STATIC_O): $(srcdir)/%.cpp
-	$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d$(DYNAMIC_DEPENDENCY_FILE)" -o $@ $<
+	$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE)$(STATIC_DEPENDENCY_FILE) -o $@ $<
 %.o: $(srcdir)/%.cpp
-	$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d$(STATIC_DEPENDENCY_FILE)" -o $@ $<
+	$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE)$(STATIC_DEPENDENCY_FILE) -o $@ $<
 
 ## Versioned libraries rules