Update ICU to 54.1 step 1

source/Makefile.in

 #******************************************************************************
 #
-#   Copyright (C) 1998-2013, International Business Machines
+#   Copyright (C) 1998-2014, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
 ## Top-level Makefile.in for ICU
 ## Stephen F. Booth
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 
 top_builddir = .
 
 include $(top_builddir)/icudefs.mk
 
 docdir = $(datadir)/doc
 docsubdir = $(PACKAGE)$(ICULIBDASHSUFFIX)/html
 docfilesdir = doc/html
 docfiles = $(docfilesdir)/*.png $(docfilesdir)/*.html $(docfilesdir)/*.css $(docfilesdir)/*.tag 
 docsrchdir = $(docfilesdir)/search
 docsrchfiles = $(docsrchdir)/*
 
 ##
 
 ## Build directory information
 subdir = .
 
 #AUTOCONF = @AUTOCONF@
 
 ## Optional directory setup
-@LAYOUT_TRUE@LAYOUT = layout layoutex
+@LAYOUT_TRUE@LAYOUT = layout
+@LAYOUTEX_TRUE@LAYOUTEX = layoutex
 @ICUIO_TRUE@ICUIO = io
 @EXTRAS_TRUE@EXTRA = extra
 @TESTS_TRUE@TEST = test
 @SAMPLES_TRUE@SAMPLE = samples
 @TOOLS_TRUE@TOOLS = tools
 
 ## pkgconfig setup. Always have uc and i18n. Others are optional.
 ALL_PKGCONFIG_SUFFIX=uc i18n
-@LAYOUT_TRUE@ALL_PKGCONFIG_SUFFIX+= le lx
+@LAYOUT_TRUE@ALL_PKGCONFIG_SUFFIX+= le
+@LAYOUTEX_TRUE@ALL_PKGCONFIG_SUFFIX+= lx
 @ICUIO_TRUE@ALL_PKGCONFIG_SUFFIX+= io
 
 DOXYGEN = @DOXYGEN@
 DOCZIP = icu-docs.zip
 
 ## Files to remove for 'make clean'
 CLEANFILES = *~
 
 ALL_PKGCONFIG_FILES=$(ALL_PKGCONFIG_SUFFIX:%=$(top_builddir)/config/icu-%.pc)
 
 ## Files built (autoconfed) and installed
 INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/config/pkgdata.inc $(top_builddir)/config/icu-config @platform_make_fragment@ $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/%) $(ALL_PKGCONFIG_FILES)
 
 ## Files built (autoconfed) but not installed
 LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk config/icucross.inc
 
 DOCDIRS = common i18n
-SUBDIRS =  stubdata common i18n $(LAYOUT) $(ICUIO) $(TOOLS) data $(EXTRA) $(SAMPLE) $(TEST)
+SUBDIRS =  stubdata common i18n $(LAYOUT) $(LAYOUTEX) $(ICUIO) $(TOOLS) data $(EXTRA) $(SAMPLE) $(TEST)
 
 SECTION = 1
 
 MANX_FILES = config/icu-config.$(SECTION)
 
 ALL_MAN_FILES = $(MANX_FILES)
 
 ## Extra files to install [nothing at present]
 EXTRA_DATA =
 
@@ skipping 86 matching lines @@
 
 clean-recursive-with-twist:
         $(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out $(CLEAN_FIRST_SUBDIRS),$(LOCAL_SUBDIRS))'
 
 all-local: $(srcdir)/configure $(LOCAL_BUILT_FILES) $(INSTALLED_BUILT_FILES)
 ifndef VERBOSE
         @echo "Note: rebuild with \"$(MAKE) VERBOSE=1 $(MAKECMDGOALS)\" to show all compiler parameters."
 endif
 install-local: install-icu install-manx
 
+# always installs. Used by layoutex.
+install-pkgconfig: $(ALL_PKGCONFIG_FILES)
+        @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
+        $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
+
 install-icu: $(INSTALLED_BUILT_FILES)
         @$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/config
         @$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
         @$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
         @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
         $(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
         $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
         $(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
         @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
         $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
@@ skipping 101 matching lines @@
         @echo $@ updated.
 
 config/icu-le.pc: config/icu.pc Makefile icudefs.mk
         @cat config/icu.pc > $@
         @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Layout library" >> $@
         @echo "Name: $(PACKAGE)-le" >> $@
         @echo "Requires: icu-uc" >> $@
         @echo "Libs:" "${ICULIBS_LE}" >> $@
         @echo $@ updated.
 
+ICULEHB_LIBS=@ICULEHB_LIBS@
+USING_HB=
+ifneq ($(ICULEHB_LIBS),)
+USING_HB=(Using HarfBuzz)
+endif
+
+
 config/icu-lx.pc: config/icu.pc Makefile icudefs.mk
         @cat config/icu.pc > $@
-        @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library" >> $@
+        @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library $(USING_HB)" >> $@
         @echo "Name: $(PACKAGE)-lx" >> $@
+ifneq ($(ICULEHB_LIBS),)
+        @echo "Requires: icu-le-hb icu-uc" >> $@
+else
         @echo "Requires: icu-le" >> $@
+endif
         @echo "Libs:" "${ICULIBS_LX}" >> $@
         @echo $@ updated.
 
 
 Makefile: $(srcdir)/Makefile.in icudefs.mk $(top_builddir)/config.status
         cd $(top_builddir) \
                 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(top_builddir)/config/Makefile.inc: $(srcdir)/config/Makefile.inc.in  $(top_builddir)/config.status
         cd $(top_builddir) \
@@ skipping 80 matching lines @@
         @echo `./config/icu-config --noverify --cxx` >> $(DESTDIR)/readme.txt
 endif
 
 check-installed-icu: install
         @echo "Testing ICU installed in $(prefix)"
         $(INSTALLED_INVOKE) $(bindir)/icuinfo$(EXEEXT)
         $(INSTALLED_INVOKE) $(bindir)/uconv$(EXEEXT) -V
         $(INSTALLED_INVOKE) $(bindir)/genrb$(EXEEXT) -V
         $(INSTALLED_INVOKE) $(bindir)/gencnval$(EXEEXT) -h
         @echo INSTALLED ICU IN "$(prefix)" OK!