ICU-310 any target whose name matches %clean does not trigger inclusion

of dependencies. Nominated SRL to review, as usual :) (Stevens, just complain if that's not okay). Now the question is: do we really want to keep the .d when we make clean? X-SVN-Rev: 1076
2000-04-05 22:14:24 +00:00 · 2000-04-05 22:14:24 +00:00 · a5957d6e46
commit a5957d6e46
parent b24fb13633
22 changed files with 22 additions and 22 deletions
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@ -135,7 +135,7 @@ unicode/platform.h: $(srcdir)/unicode/platform.h.in $(top_builddir)/config.statu
 $(TARGET) : $(OBJECTS)
 	$(SHLIB.cc) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/extra/ustdio/Makefile.in
+++ b/icu4c/source/extra/ustdio/Makefile.in
@ -116,7 +116,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(SHLIB.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@ -117,7 +117,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(SHLIB.cc) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/samples/XMLConverter/Makefile.in
+++ b/icu4c/source/samples/XMLConverter/Makefile.in
@ -98,6 +98,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif
--- a/icu4c/source/samples/cal/Makefile.in
+++ b/icu4c/source/samples/cal/Makefile.in
@ -96,7 +96,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/samples/date/Makefile.in
+++ b/icu4c/source/samples/date/Makefile.in
@ -96,7 +96,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/test/cintltst/Makefile.in
+++ b/icu4c/source/test/cintltst/Makefile.in
@ -110,6 +110,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif
--- a/icu4c/source/test/ieeetest/Makefile.in
+++ b/icu4c/source/test/ieeetest/Makefile.in
@ -96,7 +96,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@ -108,7 +108,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/ctestfw/Makefile.in
+++ b/icu4c/source/tools/ctestfw/Makefile.in
@ -97,7 +97,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(SHLIB.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/genccode/Makefile.in
+++ b/icu4c/source/tools/genccode/Makefile.in
@ -101,7 +101,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/gencmn/Makefile.in
+++ b/icu4c/source/tools/gencmn/Makefile.in
@ -101,7 +101,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/gencnval/Makefile.in
+++ b/icu4c/source/tools/gencnval/Makefile.in
@ -112,7 +112,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/gencol/Makefile.in
+++ b/icu4c/source/tools/gencol/Makefile.in
@ -141,7 +141,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/gennames/Makefile.in
+++ b/icu4c/source/tools/gennames/Makefile.in
@ -113,7 +113,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/genprops/Makefile.in
+++ b/icu4c/source/tools/genprops/Makefile.in
@ -113,7 +113,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/genrb/Makefile.in
+++ b/icu4c/source/tools/genrb/Makefile.in
@ -165,7 +165,7 @@ $(TARGET) : $(OBJECTS)
 # the 'mv' will always fail if you are building in the source dir


-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/gentest/Makefile.in
+++ b/icu4c/source/tools/gentest/Makefile.in
@ -114,7 +114,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/gentz/Makefile.in
+++ b/icu4c/source/tools/gentz/Makefile.in
@ -113,7 +113,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.cc) -o $@ $^ $(LIBS) 

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/makeconv/Makefile.in
+++ b/icu4c/source/tools/makeconv/Makefile.in
@ -121,7 +121,7 @@ $(TARGET) : $(OBJECTS)
 	@echo -n "$< -> "
 	@./makeconv -d @DATABUILDDIR@ $<

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/rbdump/Makefile.in
+++ b/icu4c/source/tools/rbdump/Makefile.in
@ -97,7 +97,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(LINK.c) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif

--- a/icu4c/source/tools/toolutil/Makefile.in
+++ b/icu4c/source/tools/toolutil/Makefile.in
@ -99,7 +99,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(TARGET) : $(OBJECTS)
 	$(SHLIB.cc) -o $@ $^ $(LIBS)

-ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif