mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 22:44:49 +00:00
ICU-319 Removed target-clean-local and its use as a prereq for install.
Moved the cleanup of the target in clean-local. In gencol, added the target force-build-data to force rebuilding data, which is what target-clean-local was doing as a side effect. X-SVN-Rev: 929
This commit is contained in:
parent
459d9959c4
commit
d75f3b5f81
10 changed files with 42 additions and 64 deletions
|
@ -227,7 +227,8 @@ srcs: $(SRCDATAFILES)
|
|||
|
||||
|
||||
## Files to remove for 'make clean'
|
||||
CLEANFILES = *~ $(BRK_FILES) $(OBJDATAFILES) $(HPUX_JUNK_OBJ)
|
||||
CLEANFILES = *~ $(BRK_FILES) $(OBJDATAFILES) $(HPUX_JUNK_OBJ) $(OBJTESTFILE) \
|
||||
$(COMMONDLL) $(TESTDATADLL) $(BASEDATADLL) $(BASETESTDATADLL)
|
||||
|
||||
|
||||
### use the "--enable-mapped=" option to configure, to get mapped file behavior.
|
||||
|
@ -261,7 +262,7 @@ clean-local:
|
|||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-local:
|
||||
rm -f Makefile $(SRCDATAFILES) $(DATFILES)
|
||||
rm -f Makefile $(SRCDATAFILES) $(DATFILES) $(TESTDATAFILE) $(BASETESTDATA)
|
||||
|
||||
check-local:
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -79,18 +79,15 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
|
||||
|
||||
install-local: target-clean-local all-local
|
||||
install-local: all-local
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -63,7 +63,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -79,18 +79,15 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
|
||||
|
||||
install-local: target-clean-local all-local
|
||||
install-local: all-local
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -67,7 +67,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local build-data
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -83,7 +83,7 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) build-data
|
||||
|
||||
install-local: target-clean-local all-local build-data
|
||||
install-local: all-local build-data
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
|
||||
|
@ -96,12 +96,9 @@ $(ICUDATADIR)/cnvalias.dat: $(CONVRTRSFILE) $(TARGET)
|
|||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -61,7 +61,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local clean-sentinel force-build-data dist dist-local check \
|
||||
check-local
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -86,7 +86,11 @@ build-data: .sentinel
|
|||
@ICU_DATA=@DATABUILDDIR@/ ./$(TARGET) > /dev/null 2>&1
|
||||
@touch .sentinel
|
||||
|
||||
install-local: target-clean-local all-local
|
||||
force-build-data: clean-sentinel build-data
|
||||
clean-sentinel:
|
||||
rm -f .sentinel
|
||||
|
||||
install-local: all-local
|
||||
# $(mkinstalldirs) $(sbindir)
|
||||
# $(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
$(mkinstalldirs) $(pkgdatadir)/$(VERSION)
|
||||
|
@ -94,12 +98,9 @@ install-local: target-clean-local all-local
|
|||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET) .sentinel
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(CNV_FILES)
|
||||
|
|
|
@ -68,7 +68,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local build-data
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -84,7 +84,7 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) build-data
|
||||
|
||||
install-local: target-clean-local all-local build-data
|
||||
install-local: all-local build-data
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
|
||||
|
@ -97,12 +97,9 @@ $(ICUDATADIR)/unames.dat: $(UNICODEFILE) $(TARGET)
|
|||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -68,7 +68,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local build-data
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -84,7 +84,7 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) build-data
|
||||
|
||||
install-local: target-clean-local all-local build-data
|
||||
install-local: all-local build-data
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
|
||||
|
@ -97,12 +97,9 @@ $(ICUDATADIR)/unames.dat: $(UNICODEFILE) $(TARGET)
|
|||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -98,7 +98,7 @@ TEST_FILES = @DATABUILDDIR@/../source/test/testdata/default.res \
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -114,7 +114,7 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
|
||||
|
||||
install-local: target-clean-local all-local
|
||||
install-local: all-local
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
$(mkinstalldirs) $(pkgdatadir)/$(VERSION)
|
||||
|
@ -130,12 +130,9 @@ install-local: target-clean-local all-local
|
|||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -68,7 +68,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local build-data
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -84,7 +84,7 @@ check: check-local
|
|||
|
||||
all-local: $(TARGET) build-data
|
||||
|
||||
install-local: target-clean-local all-local build-data
|
||||
install-local: all-local build-data
|
||||
$(mkinstalldirs) $(sbindir)
|
||||
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
|
||||
|
||||
|
@ -97,12 +97,9 @@ $(ICUDATADIR)/tz.dat: $(TZFILE) $(TZALIAS) $(TARGET)
|
|||
|
||||
dist-local:
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
|
|
|
@ -68,7 +68,7 @@ CNV_FILES = $(ALL_UCM:%.ucm=@DATABUILDDIR@/%.cnv)
|
|||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local install install-local clean clean-local \
|
||||
distclean distclean-local target-clean-local dist dist-local check \
|
||||
distclean distclean-local dist dist-local check \
|
||||
check-local
|
||||
|
||||
## Clear suffix list
|
||||
|
@ -100,12 +100,9 @@ rebuild: $(TARGET)
|
|||
-rm -f $(CNV_FILES)
|
||||
$(MAKE) all-local
|
||||
|
||||
target-clean-local:
|
||||
rm -f $(TARGET)
|
||||
|
||||
clean-local: target-clean-local
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
rm -f $(OBJECTS)
|
||||
rm -f $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
rm -f Makefile $(DEPS) $(CNV_FILES)
|
||||
|
|
Loading…
Add table
Reference in a new issue