ICU-9456 The behavior of adding the .o to the dependency list by default is compiler...

X-SVN-Rev: 32156

diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin
index 3643203fff7dd850d6bc0654bc12d9cdc32f9bd1..5d96eb71097a20db196a293620f1226651a5aee9 100644 (file)
--- a/icu4c/source/config/mh-darwin
+++ b/icu4c/source/config/mh-darwin
@@ -48,27 +48,20 @@ SO=         dylib
 ## Non-shared intermediate object suffix
 STATIC_O = ao
 
-# Make sure that both the static and dynamic intermediate objects
-# get dependency checking
-ifneq ($(ENABLE_STATIC),)
-       STATIC_DEPENDENCY_FILE=" $*.$(STATIC_O)"
-endif
-       DYNAMIC_DEPENDENCY_FILE=" $*.o"
-
 ## Override Versioned target for a shared library.
 FINAL_SO_TARGET=  $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
 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 $*.o $*.$(STATIC_O)" -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 $*.o $*.$(STATIC_O)" -o $@ $<
 
 %.$(STATIC_O): $(srcdir)/%.cpp
-       $(SILENT_COMPILE)$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE)$(STATIC_DEPENDENCY_FILE) -o $@ $<
+       $(SILENT_COMPILE)$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<
 %.o: $(srcdir)/%.cpp
-       $(SILENT_COMPILE)$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE)$(STATIC_DEPENDENCY_FILE) -o $@ $<
+       $(SILENT_COMPILE)$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<
 
 ## Versioned libraries rules