From e45f4fd7cb0d222add9156480e51225612d94820 Mon Sep 17 00:00:00 2001 From: Yves Arrouye Date: Thu, 13 Apr 2000 22:08:07 +0000 Subject: [PATCH] ICU-310 check foran empty $(MAKECMDGOALS) and also include dependencies in this case, so that a make in a subdir does include deps. X-SVN-Rev: 1122 --- icu4c/source/common/Makefile.in | 6 ++++-- icu4c/source/extra/Makefile.in | 2 -- icu4c/source/extra/ustdio/Makefile.in | 7 ++++--- icu4c/source/i18n/Makefile.in | 7 ++++--- icu4c/source/samples/XMLConverter/Makefile.in | 4 ++++ icu4c/source/samples/cal/Makefile.in | 7 ++++--- icu4c/source/samples/date/Makefile.in | 7 ++++--- icu4c/source/test/cintltst/Makefile.in | 4 ++++ icu4c/source/test/ieeetest/Makefile.in | 7 ++++--- icu4c/source/test/intltest/Makefile.in | 7 ++++--- icu4c/source/tools/ctestfw/Makefile.in | 7 ++++--- icu4c/source/tools/genccode/Makefile.in | 7 ++++--- icu4c/source/tools/gencmn/Makefile.in | 6 ++++-- icu4c/source/tools/gencnval/Makefile.in | 6 ++++-- icu4c/source/tools/gencol/Makefile.in | 5 ++++- icu4c/source/tools/gennames/Makefile.in | 6 ++++-- icu4c/source/tools/genprops/Makefile.in | 6 ++++-- icu4c/source/tools/genrb/Makefile.in | 15 +++++++-------- icu4c/source/tools/gentest/Makefile.in | 4 ++++ icu4c/source/tools/gentz/Makefile.in | 6 ++++-- icu4c/source/tools/makeconv/Makefile.in | 7 ++++--- icu4c/source/tools/rbdump/Makefile.in | 7 ++++--- icu4c/source/tools/toolutil/Makefile.in | 13 ++++--------- 23 files changed, 91 insertions(+), 62 deletions(-) diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 2990c89a46..094ddd936e 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -135,9 +135,11 @@ unicode/platform.h: $(srcdir)/unicode/platform.h.in $(top_builddir)/config.statu $(TARGET) : $(OBJECTS) $(SHLIB.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - +endif diff --git a/icu4c/source/extra/Makefile.in b/icu4c/source/extra/Makefile.in index 1f2da55014..0d7de963ce 100644 --- a/icu4c/source/extra/Makefile.in +++ b/icu4c/source/extra/Makefile.in @@ -99,5 +99,3 @@ distclean-local: clean-local Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in index fac0f68149..20f9931456 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/extra/ustdio/Makefile.in @@ -116,9 +116,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(SHLIB.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index 357718acca..97c27a3564 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -117,9 +117,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(SHLIB.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/samples/XMLConverter/Makefile.in b/icu4c/source/samples/XMLConverter/Makefile.in index aa8388704e..994f76a88f 100644 --- a/icu4c/source/samples/XMLConverter/Makefile.in +++ b/icu4c/source/samples/XMLConverter/Makefile.in @@ -98,6 +98,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif +endif diff --git a/icu4c/source/samples/cal/Makefile.in b/icu4c/source/samples/cal/Makefile.in index d0c0e51a45..4a4fe25bf8 100644 --- a/icu4c/source/samples/cal/Makefile.in +++ b/icu4c/source/samples/cal/Makefile.in @@ -96,9 +96,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/samples/date/Makefile.in b/icu4c/source/samples/date/Makefile.in index 1d1391db1a..a85be9cc91 100644 --- a/icu4c/source/samples/date/Makefile.in +++ b/icu4c/source/samples/date/Makefile.in @@ -96,9 +96,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index e295a1f66b..364f02b92c 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -110,6 +110,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif +endif diff --git a/icu4c/source/test/ieeetest/Makefile.in b/icu4c/source/test/ieeetest/Makefile.in index cc6c7844e1..3eb71254a1 100644 --- a/icu4c/source/test/ieeetest/Makefile.in +++ b/icu4c/source/test/ieeetest/Makefile.in @@ -96,9 +96,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 0aaeffa322..d1b31669e9 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -108,9 +108,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/tools/ctestfw/Makefile.in b/icu4c/source/tools/ctestfw/Makefile.in index 25b752a0b8..1f39b82151 100644 --- a/icu4c/source/tools/ctestfw/Makefile.in +++ b/icu4c/source/tools/ctestfw/Makefile.in @@ -97,9 +97,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(SHLIB.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index cd8adba264..3d210ee43f 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -101,9 +101,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index d288dc1790..d951b4dc21 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -101,8 +101,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - +endif diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index 358ddf9d26..53b98e1b27 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -112,8 +112,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - +endif diff --git a/icu4c/source/tools/gencol/Makefile.in b/icu4c/source/tools/gencol/Makefile.in index 72ef56b70c..609ba1363a 100644 --- a/icu4c/source/tools/gencol/Makefile.in +++ b/icu4c/source/tools/gencol/Makefile.in @@ -141,7 +141,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - +endif diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index 8069e7ac0a..05c4a63212 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -113,8 +113,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - +endif diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index ba3adb4e53..7e810882f1 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -113,8 +113,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - +endif \ No newline at end of file diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index 5033e1cc1c..5050db5698 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -164,14 +164,13 @@ $(TARGET) : $(OBJECTS) # the 'mv' will always fail if you are building in the source dir - -ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) --include $(DEPS) -endif - - all-local: install-local: - - +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else +ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) +-include $(DEPS) +endif +endif diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in index 21c0d380d5..3d6683e560 100644 --- a/icu4c/source/tools/gentest/Makefile.in +++ b/icu4c/source/tools/gentest/Makefile.in @@ -114,8 +114,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif +endif diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in index 2891eb4a47..6f08109f5b 100644 --- a/icu4c/source/tools/gentz/Makefile.in +++ b/icu4c/source/tools/gentz/Makefile.in @@ -113,8 +113,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - +endif \ No newline at end of file diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index 632378b104..a0e274cb41 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -121,9 +121,10 @@ $(TARGET) : $(OBJECTS) @echo -n "$< -> " @./makeconv -d @DATABUILDDIR@ $< +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/tools/rbdump/Makefile.in b/icu4c/source/tools/rbdump/Makefile.in index f0e7d2e1bd..9fc62e33f8 100644 --- a/icu4c/source/tools/rbdump/Makefile.in +++ b/icu4c/source/tools/rbdump/Makefile.in @@ -97,9 +97,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.c) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - +endif diff --git a/icu4c/source/tools/toolutil/Makefile.in b/icu4c/source/tools/toolutil/Makefile.in index 0d5fdfb2d6..08aca62efa 100644 --- a/icu4c/source/tools/toolutil/Makefile.in +++ b/icu4c/source/tools/toolutil/Makefile.in @@ -99,15 +99,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(SHLIB.cc) -o $@ $^ $(LIBS) +ifeq (,$(MAKECMDGOALS)) +-include $(DEPS) +else ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif - - - - - - - - - +endif