organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-9456 Dependency fixes for make -j 16

Browse source 
X-SVN-Rev: 32281
This commit is contained in:
George Rhoten 2012-08-28 22:57:29 +00:00
parent 75425ce174
commit 8b10488235
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/data/Makefile.in
View file

@ -671,7 +671,7 @@ $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
echo "}" >> $@;
### brk res
$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(CTD_FILES) $(DAT_FILES)
$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(DICT_FILES) $(DAT_FILES)
$(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
$(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)

20
icu4c/source/extra/uconv/Makefile.in
View file

@ -52,7 +52,7 @@ endif
## generic settings for data - common.
PKGMODE=common
INSTALLTO=$(DESTDIR)$(ICUDATA_DIR)
UCONVMSG_LIB=dummy
UCONVMSG_LIB=package-resfiles
## Static mode
ifeq ($(UCONVMSG_MODE),static)
@ -78,7 +78,7 @@ DEPS = $(OBJECTS:.o=.d)
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \
distclean resclean distclean-local dist dist-local \
check check-local build-dir resfiles package-resfiles install-resfiles install-man
check check-local build-dir package-resfiles install-resfiles install-man
## Clear suffix list
.SUFFIXES :
@ -92,7 +92,7 @@ distclean : distclean-local
dist: dist-local
check: check-local
all-local: build-dir $(TARGET) resfiles $(ALL_MAN_FILES)
all-local: build-dir $(TARGET) $(ALL_MAN_FILES)
install-local: all-local install-target install-resfiles install-man
@ -144,23 +144,16 @@ $(TARGET) : $(OBJECTS) $(UCONVMSG_LIB)
$(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
$(POST_BUILD_STEP)
resfiles: $(RESFILES) package-resfiles
# The | is an order-only prerequisite. This helps when the -j option is used,
# and we don't want the files to be built before the directories are built.
ifneq ($(filter order-only,$(.FEATURES)),)
$(RESFILES) $(RESDIR)/$(RESDIR).lst: | build-dir
endif
ifeq ($(UCONVMSG_STATIC),YES)
$(UCONVMSG_LIB): resfiles
endif
package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc
$(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc
$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
$(RESDIR)/$(RESDIR).lst: Makefile build-dir $(srcdir)/resfiles.mk
$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
@-$(RMV) $@
@for file in $(RESFILES:$(RESDIR)/%.res=%.res); do \
echo $$file >> $@; \
@ -175,9 +168,6 @@ else
install-resfiles:
endif
##
$(UCONVMSG_LIB): resfiles
$(MSGNAME)/%.res: $(srcdir)/$(RESOURCESDIR)/%.txt
$(INVOKE) $(TOOLBINDIR)/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F)