ICU-551.24.tar.gz

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

diff --git a/icuSources/Makefile.in b/icuSources/Makefile.in
index 617657e05b6ecb2dcb0a65c26e246f067d2367b7..9db6c5235b3e0b8c5bb4e767bd245dab7b22224c 100644 (file)
--- a/icuSources/Makefile.in
+++ b/icuSources/Makefile.in
@@ -1,6 +1,6 @@
 #******************************************************************************
 #
-#   Copyright (C) 1998-2013, International Business Machines
+#   Copyright (C) 1998-2014, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
@@ -29,15 +29,18 @@ 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@
@@ -55,7 +58,7 @@ INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/conf
 LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk config/icucross.inc
 
 DOCDIRS = common i18n
-SUBDIRS =  stubdata common i18n $(LAYOUT) tools data $(ICUIO) $(EXTRA) $(SAMPLE) $(TEST)
+SUBDIRS =  stubdata common i18n $(LAYOUT) $(LAYOUTEX) $(ICUIO) $(TOOLS) data $(EXTRA) $(SAMPLE) $(TEST)
 
 SECTION = 1
 
@@ -89,6 +92,9 @@ xcheck: all xcheck-recursive
 xperf: all xperf-recursive
 check-exhaustive: all check-exhaustive-recursive
 
+pcheck: all tests
+       @$(MAKE) -C test pcheck
+
 check-exhaustive-local: check-local
 
 xcheck-recursive: all xcheck-local
@@ -127,7 +133,7 @@ $(DOCZIP): doc
 endif
 
 LOCAL_SUBDIRS = $(SUBDIRS)
-CLEAN_FIRST_SUBDIRS = tools
+CLEAN_FIRST_SUBDIRS = $(TOOLS)
 
 $(LIBDIR) $(BINDIR):
        -$(MKINSTALLDIRS) $@
@@ -159,6 +165,11 @@ ifndef VERBOSE
 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)
@@ -220,8 +231,8 @@ xcheck-local: $(top_builddir)/config/icu-config $(top_builddir)/config/Makefile.
        @test "passed" = "$(shell $(MAKE) --no-print-directory -f $(top_builddir)/config/Makefile.inc SELFCHECK=1 selfcheck)" || (echo "FAIL: Makefile.inc could not run properly." ; exit 1 )
        @echo "PASS: config selfcheck OK"
 
-#$(srcdir)/configure : $(srcdir)/configure.in $(top_srcdir)/aclocal.m4
-#      cd $(srcdir) && $(AUTOCONF)
+#$(srcdir)/configure : $(srcdir)/configure.ac $(top_srcdir)/aclocal.m4
+#      cd $(srcdir) && aclocal && $(AUTOCONF)
 
 icudefs.mk: $(srcdir)/icudefs.mk.in  $(top_builddir)/config.status
        cd $(top_builddir) \
@@ -280,11 +291,22 @@ config/icu-le.pc: config/icu.pc Makefile icudefs.mk
        @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.