ICU-59180.0.1.tar.gz

[apple/icu.git] / icuSources / extra / uconv / Makefile.in

diff --git a/icuSources/extra/uconv/Makefile.in b/icuSources/extra/uconv/Makefile.in
index 5ab56c51b187c126c8f556abf25b02e2f2989852..b6144619d00a7fa4b3d0c943ff16b3f498c6071e 100644 (file)
--- a/icuSources/extra/uconv/Makefile.in
+++ b/icuSources/extra/uconv/Makefile.in
@@ -1,6 +1,8 @@
+## Copyright (C) 2016 and later: Unicode, Inc. and others.
+## License & terms of use: http://www.unicode.org/copyright.html
 ## ******************************************************************************
 ## *
-## *   Copyright (C) 1999-2012, International Business Machines
+## *   Copyright (C) 1999-2014, International Business Machines
 ## *   Corporation and others.  All Rights Reserved.
 ## *
 ## *******************************************************************************
@@ -42,7 +44,8 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 ifeq ($(PKGDATA_OPTS),)
@@ -52,7 +55,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)
@@ -77,7 +80,8 @@ 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 resfiles package-resfiles install-resfiles install-man
+distclean resclean distclean-local dist dist-local \
+check check-local build-dir package-resfiles install-resfiles install-man
 
 ## Clear suffix list
 .SUFFIXES :
@@ -91,7 +95,7 @@ distclean : distclean-local
 dist: dist-local
 check: check-local
 
-all-local: $(TARGET) resfiles $(ALL_MAN_FILES)
+all-local: build-dir $(TARGET) $(ALL_MAN_FILES)
 
 install-local: all-local install-target install-resfiles install-man
 
@@ -128,6 +132,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 pkgdata.inc: pkgdataMakefile
        $(MAKE) -f pkgdataMakefile
 
+build-dir:
+       @$(MKINSTALLDIRS) $(RESDIR)
+
 pkgdataMakefile:
        cd $(top_builddir) \
        && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -140,18 +147,16 @@ $(TARGET) : $(OBJECTS)  $(UCONVMSG_LIB)
        $(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
        $(POST_BUILD_STEP)
 
-resfiles: $(RESFILES) package-resfiles
-
-ifeq ($(UCONVMSG_STATIC),YES)
-$(UCONVMSG_LIB): 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
 
-
-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 $(srcdir)/resfiles.mk
-       @$(MKINSTALLDIRS) $(RESDIR)
        @-$(RMV) $@
        @for file in $(RESFILES:$(RESDIR)/%.res=%.res); do \
          echo $$file >> $@; \
@@ -166,11 +171,7 @@ else
 install-resfiles:
 endif
 
-##
-$(UCONVMSG_LIB): resfiles
-
 $(MSGNAME)/%.res: $(srcdir)/$(RESOURCESDIR)/%.txt
-       $(MKINSTALLDIRS) $(@D)
        $(INVOKE) $(TOOLBINDIR)/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F)
 
 install-man: $(ALL_MAN_FILES)