diff options
| author | James Henstridge <james@daa.com.au> | 2003-03-11 12:31:16 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2003-03-11 12:31:16 +0000 |
| commit | bdd7e7f65c9f97b397b4ebe2550a6c2752adfe08 (patch) | |
| tree | 26110dd7a72388712a01aad97aa1ce4ed29f4eb1 | |
| parent | 411bd8c907fbf018a8d7529b6a858a8c11f87bd3 (diff) | |
| download | pango-bdd7e7f65c9f97b397b4ebe2550a6c2752adfe08.tar.gz | |
make similar changes to the ones on glib head (call gtk-docize, etc).
2003-03-11 James Henstridge <james@daa.com.au>
* autogen.sh: make similar changes to the ones on glib head (call
gtk-docize, etc).
* configure.in: move some calculations into M4 macros, rather than
calculating them when configure runs.
Use AC_HELP_STRING where appropriate.
Replace gtk-doc checks with a call to GTK_DOC_CHECK.
Replace AC_OUTPUT_COMMANDS() call with a number of calls to
AC_CONFIG_COMMANDS (once per created file).
Get rid of the "chmod +x pango-config" bit, because there is no
pango-config anymore.
* Makefile.am: get rid of custom distcheck rule, and set
DISTCHECK_CONFIGURE_FLAGS, which is equivalent.
Use += to select which .pc files to install.
* pango/Makefile.am: Add rules to rebuild module-defs* files, and
remove them on clean.
Reorder so that rules related to each individual library are next
to each other.
Use BUILT_SOURCES for built sources.
* pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END.
* modules/*/Makefile.am: simplify module makefiles through use of
+=, and regularise them a bit (fixed a few bugs in the process).
* docs/Makefile.am: remove common rules, and instead include
gtk-doc.make.
* examples/Makefile.am: add pango.modules to CLEANFILES.
* tests/Makefile.am: remove temporary files on clean.
| -rw-r--r-- | ChangeLog | 36 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 36 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 36 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 36 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 36 | ||||
| -rw-r--r-- | Makefile.am | 40 | ||||
| -rwxr-xr-x | autogen.sh | 52 | ||||
| -rw-r--r-- | configure.in | 204 | ||||
| -rw-r--r-- | docs/Makefile.am | 185 | ||||
| -rw-r--r-- | docs/tmpl/fonts.sgml | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/arabic/Makefile.am | 131 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 145 | ||||
| -rw-r--r-- | modules/hangul/Makefile.am | 80 | ||||
| -rw-r--r-- | modules/hebrew/Makefile.am | 119 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 166 | ||||
| -rw-r--r-- | modules/tamil/Makefile.am | 51 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 86 | ||||
| -rw-r--r-- | pango/Makefile.am | 382 | ||||
| -rw-r--r-- | pango/opentype/Makefile.am | 11 | ||||
| -rw-r--r-- | tests/Makefile.am | 52 |
21 files changed, 870 insertions, 1018 deletions
@@ -1,3 +1,39 @@ +2003-03-09 James Henstridge <james@daa.com.au> + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> * configure.in **/Makefile.am: Add an --enable-debug diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b8d528d4..68e017f9 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,39 @@ +2003-03-09 James Henstridge <james@daa.com.au> + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> * configure.in **/Makefile.am: Add an --enable-debug diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b8d528d4..68e017f9 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,39 @@ +2003-03-09 James Henstridge <james@daa.com.au> + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> * configure.in **/Makefile.am: Add an --enable-debug diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b8d528d4..68e017f9 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,39 @@ +2003-03-09 James Henstridge <james@daa.com.au> + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> * configure.in **/Makefile.am: Add an --enable-debug diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b8d528d4..68e017f9 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,39 @@ +2003-03-09 James Henstridge <james@daa.com.au> + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> * configure.in **/Makefile.am: Add an --enable-debug diff --git a/Makefile.am b/Makefile.am index 1b2c0599..2df2434a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to create Makefile.in. +AUTOMAKE_OPTIONS = 1.7 + SUBDIRS= pango modules examples docs tools tests EXTRA_DIST = \ @@ -18,45 +20,23 @@ EXTRA_DIST = \ pango-zip.sh \ sanitize-la.sh +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = pango.pc + if HAVE_X -X_PC=pangox.pc +pkgconfig_DATA += pangox.pc endif if HAVE_XFT -XFT_PC=pangoxft.pc +pkgconfig_DATA += pangoxft.pc endif if HAVE_FREETYPE -FT2_PC=pangoft2.pc +pkgconfig_DATA += pangoft2.pc endif if HAVE_WIN32 -WIN32_PC=pangowin32.pc +pkgconfig_DATA += pangowin32.pc endif -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = pango.pc $(X_PC) $(XFT_PC) $(FT2_PC) $(WIN32_PC) - -# This is a version of the automake-1.4 distcheck rule modified -# to pass --enable-gtk-doc to ./configure -# -mydistcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc @@ -13,8 +13,8 @@ FILE=pango/pango.h DIE=0 have_libtool=false -if libtool --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | libtoolize --version | sed 's/^[^0-9]*\([0-9].[0-9.]*\).*/\1/'` +if libtoolize --version < /dev/null > /dev/null 2>&1 ; then + libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9].[0-9.]*\).*/\1/'` case $libtool_version in 1.4*) have_libtool=true @@ -25,34 +25,34 @@ if $have_libtool ; then : ; else echo echo "You must have libtool 1.4 installed to compile $PROJECT." echo "Install the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" DIE=1 fi +(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have gtk-doc installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" + DIE=1 +} + (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $PROJECT." echo "libtool the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" DIE=1 } -have_automake=false -if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then - automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` - case $automake_version in - 1.2*|1.3*|1.4) - ;; - *) - have_automake=true - ;; - esac -fi -if $have_automake ; then : ; else +if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake-1.7 + ACLOCAL=aclocal-1.7 +else echo - echo "You must have automake 1.4-p6 installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p6.tar.gz" - echo "(or a newer version if it is available)" + echo "You must have automake 1.7.x installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" DIE=1 fi @@ -72,13 +72,15 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then fi fi -aclocal-1.4 $ACLOCAL_FLAGS +$ACLOCAL $ACLOCAL_FLAGS || exit 1 + +libtoolize --force || exit 1 +gtkdocize || exit 1 -# optionally run autoheader -(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader +autoheader || exit 1 -automake-1.4 -a $am_opt -autoconf +$AUTOMAKE --add-missing || exit 1 +autoconf || exit 1 cd $ORIGDIR if test -z "$AUTOGEN_SUBDIR_MODE"; then @@ -86,4 +88,4 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then echo echo "Now type 'make' to compile $PROJECT." -fi
\ No newline at end of file +fi diff --git a/configure.in b/configure.in index 40daf720..cebd5e9e 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,5 @@ dnl Process this file with autoconf to create configure. -AC_PREREQ(2.53) -AC_INIT(ChangeLog) +AC_PREREQ(2.54) dnl ========================================================================== dnl Versioning @@ -21,30 +20,42 @@ dnl of them. dnl dnl The triplet -m4_define([pango_major_version],1) -m4_define([pango_minor_version],2) -m4_define([pango_micro_version],1) - -PANGO_MAJOR_VERSION=pango_major_version() -PANGO_MINOR_VERSION=pango_minor_version() -PANGO_MICRO_VERSION=pango_micro_version() -PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION - +m4_define([pango_major_version], [1]) +m4_define([pango_minor_version], [2]) +m4_define([pango_micro_version], [1]) +m4_define([pango_version], + [pango_major_version.pango_minor_version.pango_micro_version]) dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2. -PANGO_API_VERSION=1.0 - +m4_define([pango_api_version], [1.0]) dnl Number of releases since we've added interfaces -PANGO_INTERFACE_AGE=0 - +m4_define([pango_interface_age], [0]) dnl Number of releases since we've broken binary compatibility. -# PANGO_BINARY_AGE=0 -PANGO_BINARY_AGE=`expr 100 '*' $PANGO_MINOR_VERSION + $PANGO_MICRO_VERSION` - +m4_define([pango_binary_age], + [m4_eval(100 * pango_minor_version + pango_micro_version)]) dnl This is the last version with which we have compatibility with dnl with the modules for; it isn't the same as dnl PANGO_API_VERSION.'PANGO_MICRO_VERSION - PANGO_BINARY_AGE' since we have dnl engine only API -PANGO_MODULE_VERSION=1.2.0 +m4_define([pango_module_version], [1.2.0]) + + +AC_INIT(pango, [pango_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=pango]) + +AC_CONFIG_SRCDIR([ChangeLog]) + +AM_INIT_AUTOMAKE +AM_CONFIG_HEADER([config.h]) + + +PANGO_MAJOR_VERSION=pango_major_version() +PANGO_MINOR_VERSION=pango_minor_version() +PANGO_MICRO_VERSION=pango_micro_version() +PANGO_VERSION=pango_version() +PANGO_API_VERSION=pango_api_version() +PANGO_INTERFACE_AGE=pango_interface_age() +PANGO_BINARY_AGE=pango_binary_age() +PANGO_MODULE_VERSION=pango_module_version() AC_SUBST(PANGO_MAJOR_VERSION) AC_SUBST(PANGO_MINOR_VERSION) @@ -56,28 +67,24 @@ AC_SUBST(PANGO_BINARY_AGE) AC_SUBST(PANGO_MODULE_VERSION) dnl libtool versioning -lt_current=`expr 100 '*' $PANGO_MINOR_VERSION + $PANGO_MICRO_VERSION - $PANGO_INTERFACE_AGE` -lt_revision=$PANGO_INTERFACE_AGE -lt_age=`expr $PANGO_BINARY_AGE - $PANGO_INTERFACE_AGE` -LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" -LT_CURRENT_MINUS_AGE=`expr $lt_current - $lt_age` +m4_define([lt_current], [m4_eval(100 * pango_minor_version + pango_micro_version - pango_interface_age)]) +m4_define([lt_revision], [pango_interface_age]) +m4_define([lt_age], [m4_eval(pango_binary_age - pango_interface_age)]) +LT_VERSION_INFO="lt_current():lt_revision():lt_age()" +LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_CURRENT_MINUS_AGE) dnl ========================================================================== -AM_INIT_AUTOMAKE(pango, $PANGO_VERSION) - -AM_CONFIG_HEADER(config.h) - AC_PROG_CC dnl dnl Check for a working C++ compiler, but do not bail out, if none is found. dnl We use this for an automated test for C++ header correctness. dnl -AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc) +AC_CHECK_PROGS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) @@ -128,10 +135,13 @@ changequote([,])dnl dnl declare --enable-* args and collect ac_help strings -m4_define([debug_default],dnl -m4_if(m4_bregexp(pango_minor_version(),[[13579]]),-1,minimum,yes)) +m4_define([debug_default], + m4_if(m4_eval(pango_minor_version() % 2), [1], [yes], [minimum])) -AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging @<:@default=]debug_default()[@:>@],,enable_debug=debug_default()) +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], + [turn on debugging @<:@default=debug_default()@:>@]),, + enable_debug=debug_default()) if test "x$enable_debug" = "xyes"; then PANGO_DEBUG_FLAGS="-DPANGO_ENABLE_DEBUG" @@ -145,9 +155,12 @@ fi AC_SUBST(PANGO_DEBUG_FLAGS) -AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) +AC_ARG_ENABLE(rebuilds, + [AC_HELP_STRING([--disable-rebuilds], + [disable all source autogeneration rules])],, + [enable_rebuilds=yes]) -AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) +AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes]) # define a MAINT-like variable REBUILD which is set if Perl # is found, so autogenerated sources can be rebuilt @@ -305,7 +318,9 @@ AM_CONDITIONAL(HAVE_FRIBIDI, test x$have_fribidi = xyes) # # Allow setting a default path for XftConfig # -AC_ARG_WITH(xftconfig-dir, [ --with-xftconfig-dir=PATH path to system XftConfig file for minixft ]) +AC_ARG_WITH(xftconfig-dir, + [AC_HELP_STRING([--with-xftconfig-dir=PATH], + [path to system XftConfig file for minixft])]) if test "x$with_xftconfig_dir" != "x"; then AC_DEFINE_UNQUOTED(MINI_XFTCONFIG_DIR, "$with_xftconfig_dir") @@ -334,7 +349,13 @@ CPPFLAGS=$pango_saved_cppflags # AC_MSG_CHECKING(modules to link statically) -AC_ARG_WITH(included_modules, [ --with-included-modules=MODULE1,MODULE2,... build the given modules into Pango]) +dnl I would use AC_HELP_STRING here, but due to some bugs in m4_text_wrap, +dnl it interprets the commas incorrectly ... +dnl AC_HELP_STRING([--with-included-modules=MODULE1 MODULE2 ...], +dnl [build the given modules into Pango]) +AC_ARG_WITH(included_modules, +[ --with-included-modules=MODULE1,MODULE2,... + build the given modules into Pango]) arabic_modules="arabic-ft2,arabic-x,arabic-xft" basic_modules="basic-ft2,basic-win32,basic-x,basic-xft" @@ -431,9 +452,10 @@ AC_CHECK_FUNCS(flockfile strtok_r) # AC_ARG_WITH(usp10, -[ --with-usp10=DIRECTORY where to find the usp10.h header file for Win32 - (typically the Include directory in the - Platform SDK)]) + [AC_HELP_STRING([--with-usp10=DIRECTORY], + [where to find the usp10.h header file for Win32 + (typically the Include directory in the + Platform SDK)])]) USP10_H=no if test "${with_usp10+set}" = set && test "$with_usp10" != no; then @@ -460,7 +482,10 @@ AM_CONDITIONAL(HAVE_USP10_H, test "$USP10_H" != no) # present # -AC_ARG_WITH(qt, [ --with-qt=DIR location where Qt is installed],,with_qt=yes) +AC_ARG_WITH(qt, + [AC_HELP_STRING([--with-qt=DIR], + [location where Qt is installed])],, + [with_qt=yes]) if test "$CXX" != "" ; then AC_MSG_CHECKING(For Qt location) @@ -528,64 +553,7 @@ dnl ************************** dnl *** Checks for gtk-doc *** dnl ************************** -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) - -if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gtk-doc/html' -else - HTML_DIR=$with_html_dir -fi - -AC_SUBST(HTML_DIR) - -# -# Check for sufficiently new gtk-doc -# -gtk_doc_min_version=0.10 - -AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) -if $GTKDOC ; then - gtk_doc_version=`gtkdoc-mkdb --version` - AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version]) - - IFS="${IFS= }"; pango_save_IFS="$IFS"; IFS="." - set $gtk_doc_version - for min in $gtk_doc_min_version ; do - cur=$1; shift - if test -z $min ; then break; fi - if test -z $cur ; then GTKDOC=false; break; fi - if test $cur -gt $min ; then break ; fi - if test $cur -lt $min ; then GTKDOC=false; break ; fi - done - IFS="$pango_save_IFS" - - if $GTKDOC ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -fi - -AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC) -AC_SUBST(HAVE_GTK_DOC) - -AC_CHECK_PROG(DB2HTML, db2html, true, false) -AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) - -dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=no) - -if test x$enable_gtk_doc = xyes ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi -fi - -dnl NOTE: We need to use a separate automake conditional for this -dnl to make this work with the tarballs. -AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +GTK_DOC_CHECK([1.0]) dnl ******************************************************** dnl * See whether we need to load our modules as .la files * @@ -640,7 +608,8 @@ AC_SUBST(PKGCONFIG_XFT_LIBS) AC_SUBST(PKGCONFIG_FREETYPE_LIBS) AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no) -AC_OUTPUT_COMMANDS([ +AC_CONFIG_COMMANDS([pango/module-defs.h], +[ cat > pango/module-defs.h <<EOTEXT /* Autogenerated by configure. Do not edit */ @@ -660,14 +629,19 @@ EOTEXT done IFS="$pango_save_ifs" +],[ +included_modules=$included_modules +]) +AC_CONFIG_COMMANDS([pango/module-defs-x.c], +[ ### X modules cat > pango/module-defs-x.c <<EOTEXT /* Autogenerated by configure. Do not edit */ #include "module-defs.h" -PangoIncludedModule _pango_included_x_modules[] = { +PangoIncludedModule _pango_included_x_modules@<:@@:>@ = { EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," @@ -686,15 +660,17 @@ cat >> pango/module-defs-x.c <<EOTEXT { NULL, NULL, NULL }, }; EOTEXT +]) - +AC_CONFIG_COMMANDS([pango/module-defs-xft.c], +[ ### XFT modules cat > pango/module-defs-xft.c <<EOTEXT /* Autogenerated by configure. Do not edit */ #include "module-defs.h" -PangoIncludedModule _pango_included_xft_modules[] = { +PangoIncludedModule _pango_included_xft_modules@<:@@:>@ = { EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," @@ -713,15 +689,17 @@ cat >> pango/module-defs-xft.c <<EOTEXT { NULL, NULL, NULL }, }; EOTEXT +]) - +AC_CONFIG_COMMANDS([pango/module-defs-ft2.c], +[ ### FT2 modules cat > pango/module-defs-ft2.c <<EOTEXT /* Autogenerated by configure. Do not edit */ #include "module-defs.h" -PangoIncludedModule _pango_included_ft2_modules[] = { +PangoIncludedModule _pango_included_ft2_modules@<:@@:>@ = { EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," @@ -740,14 +718,17 @@ cat >> pango/module-defs-ft2.c <<EOTEXT { NULL, NULL, NULL }, }; EOTEXT +]) +AC_CONFIG_COMMANDS([pango/module-defs-win32.c], +[ ### Win32 modules cat > pango/module-defs-win32.c <<EOTEXT /* Autogenerated by configure. Do not edit */ #include "module-defs.h" -PangoIncludedModule _pango_included_win32_modules[] = { +PangoIncludedModule _pango_included_win32_modules@<:@@:>@ = { EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," @@ -766,18 +747,16 @@ cat >> pango/module-defs-win32.c <<EOTEXT { NULL, NULL, NULL }, }; EOTEXT - -],[ -included_modules=$included_modules ]) + AC_HEADER_DIRENT AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) # Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile pango/Makefile pango/mini-fribidi/Makefile @@ -809,9 +788,10 @@ pangowin32-uninstalled.pc pangoft2-uninstalled.pc pangoxft-uninstalled.pc pango-zip.sh -],[case "$CONFIG_FILES" in -*pango-config*)chmod +x pango-config;; -esac]) +]) + +AC_OUTPUT + echo "configuration: backends: `if $have_freetype && $have_fontconfig; then echo " FreeType"; fi \ ``if $have_x ; then echo " X"; fi \ diff --git a/docs/Makefile.am b/docs/Makefile.am index 2e016cbb..25889432 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,22 +1,18 @@ ## Process this file with automake to create Makefile.in. +AUTOMAKE_OPTIONS = 1.6 + # The name of the module. DOC_MODULE=pango # The top-level SGML file. DOC_MAIN_SGML_FILE=pango-docs.sgml -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=../pango - # Extra options to supply to gtkdoc-scan SCAN_OPTIONS= -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS= +# The directory containing the source code. Relative to $(srcdir) +DOC_SOURCE_DIR=../pango # Used for dependencies HFILE_GLOB=$(top_srcdir)/pango/*.h @@ -35,172 +31,43 @@ IGNORE_HFILES= \ pangox-private.h \ pangoxft-private.h -# Extra files to add when scanning -EXTRA_HFILES= +# CFLAGS and LDFLAGS for compiling scan program. Only needed +# if $(DOC_MODULE).types is non-empty. +INCLUDES = \ + -DPANGO_ENABLE_BACKEND \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) + +GTKDOC_LIBS = $(top_builddir)/pango/libpango-1.0.la + + +# Extra options to supply to gtkdoc-mkdb +MKDB_OPTIONS=--sgml-mode --output-format=xml -# Images to copy into HTML directory -HTML_IMAGES = \ - layout.gif # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ pango_markup.sgml \ version.xml -extra_files = \ +# Images to copy into HTML directory +HTML_IMAGES = \ + layout.gif + +# Extra options to supply to gtkdoc-fixref +FIXXREF_OPTIONS= + +include $(top_srcdir)/gtk-doc.make + +EXTRA_DIST += \ layout.fig \ layout.eps \ version.xml.in -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -DPANGO_ENABLE_BACKEND \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -GTKDOC_LIBS = \ - $(top_builddir)/pango/libpango-1.0.la -# Commands for compiling and linking -GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) -GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) dist-hook-local: mkdir $(distdir)/TEXT; \ for f in $(srcdir)/TEXT/* ; do \ test -f $$f && cp -p $$f $(distdir)/TEXT; \ done - - -#################################### -# Everything below here is generic # -#################################### - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(extra_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE).types \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -if ENABLE_GTK_DOC -all-local: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) - @echo '*** Scanning header files ***' - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo '*** Rebuilding template files ***' - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### sgml #### - -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml - @echo '*** Building SGML ***' - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo '*** Building HTML ***' - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp -endif - -############## - -clean-local: - rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ - fi) - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/* $(distdir)/html - -.PHONY : dist-hook-local diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml index 15ee3268..e5385006 100644 --- a/docs/tmpl/fonts.sgml +++ b/docs/tmpl/fonts.sgml @@ -691,6 +691,7 @@ The #PangoFontMapClass structure holds the virtual functions for a particular #PangoFontMap implementation. </para> +@parent_class: @load_font: a function to load a font with a given description. See pango_font_map_load_font() @list_families: A function to list available font families. See @@ -778,6 +779,7 @@ The #PangoFontsetClass structure holds the virtual functions for a particular #PangoFontset implementation. </para> +@parent_class: @get_font: a function to get the font in the fontset that contains the best glyph for the given unicode character; see pango_fontset_get_font(). @get_metrics: a function to get overall metric information for the fonts diff --git a/examples/Makefile.am b/examples/Makefile.am index f83e320c..8d10b2b4 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -32,7 +32,7 @@ pango_viewer_SOURCES = \ viewer-qt.cc \ viewer-qt.h -CLEANFILES = moc_viewer-qt.cc +CLEANFILES = moc_viewer-qt.cc pango.modules pango_viewer_LDADD = \ ../pango/libpangox-$(PANGO_API_VERSION).la \ ../pango/libpango-$(PANGO_API_VERSION).la \ diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 0345b283..3aeafb90 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -5,21 +5,31 @@ pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $ pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_ARABIC_XFT -XFT_MODULES= -XFT_INCLUDED=libpango-arabic-xft.la -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_MODULES=pango-arabic-xft.la -XFT_INCLUDED= -XFT_PREFIX= -arabic_xft_libadd=$(pangoxftlibs) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +if PLATFORM_WIN32 +no_undefined = -no-undefined endif + + +if HAVE_X +INCLUDES += $(X_CFLAGS) +if INCLUDE_ARABIC_X +noinst_LTLIBRARIES += libpango-arabic-x.la +INCLUDES += -DX_MODULE_PREFIX else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= +module_LTLIBRARIES += pango-arabic-x.la +endif endif x_sources = \ @@ -33,89 +43,54 @@ x_sources = \ naqshfont.h \ arconv.h +pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_arabic_x_la_LIBADD = $(pangoxlibs) +pango_arabic_x_la_SOURCES = $(x_sources) +libpango_arabic_x_la_SOURCES = $(x_sources) + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_ARABIC_XFT +noinst_LTLIBRARIES += libpango-arabic-xft.la +INCLUDES += -DXFT_MODULE_PREFIX +else +module_LTLIBRARIES += pango-arabic-xft.la +endif +endif + xft_sources = \ arabic-xft.c \ arabic-ot.c \ arabic-ot.h -ft2_sources = \ - arabic-ft2.c \ - arabic-ot.c \ - arabic-ot.h +pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_arabic_xft_la_LIBADD = $(pangoxftlibs) +pango_arabic_xft_la_SOURCES = $(xft_sources) +libpango_arabic_xft_la_SOURCES = $(xft_sources) -if HAVE_X -if INCLUDE_ARABIC_X -X_MODULES= -X_INCLUDED=libpango-arabic-x.la -X_PREFIX=-DX_MODULE_PREFIX -else -X_MODULES=pango-arabic-x.la -X_INCLUDED= -X_PREFIX= -arabic_x_libadd=$(pangoxlibs) -endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= -endif if HAVE_FREETYPE +INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_ARABIC_FT2 -FT2_MODULES= -FT2_INCLUDED=libpango-arabic-ft2.la -FT2_PREFIX=-DFT2_MODULE_PREFIX -else -FT2_MODULES=pango-arabic-ft2.la -FT2_INCLUDED= -FT2_PREFIX= -arabic_ft2_libadd=$(pangoft2libs) -endif +noinst_LTLIBRARIES += libpango-arabic-ft2.la +INCLUDES += -DFT2_MODULE_PREFIX else -FT2_MODULES= -FT2_INCLUDED= -FT2_PREFIX= +module_LTLIBRARIES += pango-arabic-ft2.la endif - -if PLATFORM_WIN32 -no_undefined = -no-undefined endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) - -pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_arabic_x_la_LIBADD = $(arabic_x_libadd) -pango_arabic_x_la_SOURCES = $(x_sources) - -libpango_arabic_x_la_SOURCES = $(x_sources) - -pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_arabic_xft_la_LIBADD = $(arabic_xft_libadd) -pango_arabic_xft_la_SOURCES = $(xft_sources) - -libpango_arabic_xft_la_SOURCES = $(xft_sources) +ft2_sources = \ + arabic-ft2.c \ + arabic-ot.c \ + arabic-ot.h pango_arabic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_arabic_ft2_la_LIBADD = $(arabic_ft2_libadd) +pango_arabic_ft2_la_LIBADD = $(pangoft2libs) pango_arabic_ft2_la_SOURCES = $(ft2_sources) - libpango_arabic_ft2_la_SOURCES = $(ft2_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 155b6716..f9ed1bf6 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -8,112 +8,84 @@ pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_L pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs) -if HAVE_XFT -if INCLUDE_BASIC_XFT -XFT_INCLUDED=libpango-basic-xft.la -XFT_MODULES= -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_INCLUDED= -XFT_MODULES=pango-basic-xft.la -XFT_PREFIX= -basic_xft_libadd=$(pangoxlibs) $(pangoxftlibs) -endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= -endif +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) \ + $(moddefine) -if HAVE_FREETYPE -if INCLUDE_BASIC_FT2 -FT2_INCLUDED=libpango-basic-ft2.la -FT2_MODULES= -FT2_PREFIX=-DFT2_MODULE_PREFIX -else -FT2_INCLUDED= -FT2_MODULES=pango-basic-ft2.la -FT2_PREFIX= -basic_ft2_libadd=$(pangoft2libs) -endif -else -FT2_MODULES= -FT2_INCLUDED= -FT2_PREFIX= +if PLATFORM_WIN32 +no_undefined = -no-undefined endif +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +moddefine = + if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_BASIC_X -X_INCLUDED=libpango-basic-x.la -X_MODULES= -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-basic-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_INCLUDED= -X_MODULES=pango-basic-x.la -X_PREFIX= -basic_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-basic-x.la endif -else -X_INCLUDED= -X_MODULES= -X_PREFIX= endif -if HAVE_WIN32 -if INCLUDE_BASIC_WIN32 -WIN32_INCLUDED=libpango-basic-win32.la -WIN32_MODULES= -WIN32_PREFIX=-DWIN32_MODULE_PREFIX -else -WIN32_INCLUDED= -WIN32_MODULES=pango-basic-win32.la -WIN32_PREFIX= -basic_win32_libadd=$(pangowin32libs) -lgdi32 -endif +pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_basic_x_la_LIBADD = $(pangoxlibs) +pango_basic_x_la_SOURCES = basic-x.c +libpango_basic_x_la_SOURCES = basic-x.c + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_BASIC_XFT +noinst_LTLIBRARIES += libpango-basic-xft.la +INCLUDES += -DXFT_MODULE_PREFIX else -WIN32_INCLUDED= -WIN32_MODULES= -WIN32_PREFIX= +module_LTLIBRARIES += pango-basic-xft.la endif - -if PLATFORM_WIN32 -no_undefined = -no-undefined endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) $(WIN32_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) $(WIN32_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) $(WIN32_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ - $(moddefine) - -pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_basic_x_la_LIBADD = $(basic_x_libadd) -pango_basic_x_la_SOURCES = $(basic_sources) -libpango_basic_x_la_SOURCES = $(basic_sources) - pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_basic_xft_la_LIBADD = $(basic_xft_libadd) +pango_basic_xft_la_LIBADD = $(pangoxftlibs) pango_basic_xft_la_SOURCES = basic-xft.c libpango_basic_xft_la_SOURCES = basic-xft.c + +if HAVE_FREETYPE +INCLUDES += $(FREETYPE_CFLAGS) +if INCLUDE_BASIC_FT2 +noinst_LTLIBRARIES += libpango-basic-ft2.la +INCLUDES += -DFT2_MODULE_PREFIX +else +module_LTLIBRARIES += pango-basic-ft2.la +endif +endif + pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_basic_ft2_la_LIBADD = $(basic_ft2_libadd) +pango_basic_ft2_la_LIBADD = $(pangoft2libs) pango_basic_ft2_la_SOURCES = basic-ft2.c libpango_basic_ft2_la_SOURCES = basic-ft2.c + +if HAVE_WIN32 +if INCLUDE_BASIC_WIN32 +noinst_LTLIBRARIES += libpango-basic-win32.la +moddefine += -DWIN32_MODULE_PREFIX +else +module_LTLIBRARIES += pango-basic-win32.la +endif +endif + pango_basic_win32_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_basic_win32_la_LIBADD = $(basic_win32_libadd) +pango_basic_win32_la_LIBADD = $(pangowin32libs) -lgdi32 pango_basic_win32_la_SOURCES = basic-win32.c libpango_basic_win32_la_SOURCES = basic-win32.c @@ -121,10 +93,11 @@ if HAVE_USP10_H basic-win32.lo: usp10.h # Do it like this to avoid getting other headers from where usp10.h is -usp10.h: @USP10_H@ - cp -p @USP10_H@ usp10.h +usp10.h: $(USP10_H) + cp -p $(USP10_H) usp10.h endif + EXTRA_DIST = \ basic-common.h \ tables-big.i \ diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 05b13a3a..c90b9e0a 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -5,72 +5,54 @@ pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $ pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -x_sources = hangul-x.c hangul-defs.h -xft_sources = hangul-xft.c hangul-defs.h +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) -if HAVE_XFT -if INCLUDE_HANGUL_XFT -XFT_INCLUDED=libpango-hangul-xft.la -XFT_MODULES= -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_MODULES=pango-hangul-xft.la -XFT_INCLUDED= -XFT_PREFIX= -hangul_xft_libadd=$(pangoxftlibs) -endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= -endif +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_HANGUL_X -X_MODULES= -X_INCLUDED=libpango-hangul-x.la -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-hangul-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_MODULES=pango-hangul-x.la -X_INCLUDED= -X_PREFIX= -hangul_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-hangul-x.la endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) +x_sources = hangul-x.c hangul-defs.h pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hangul_x_la_LIBADD = $(pangoxlibs) pango_hangul_x_la_SOURCES = $(x_sources) -pango_hangul_x_la_LIBADD = $(hangul_x_libadd) - libpango_hangul_x_la_SOURCES = $(x_sources) + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_HANGUL_XFT +noinst_LTLIBRARIES += libpango-hangul-xft.la +INCLUDES += -DXFT_MODULE_PREFIX +else +module_LTLIBRARIES += pango-hangul-xft.la +endif +endif + +xft_sources = hangul-xft.c hangul-defs.h + pango_hangul_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_hangul_xft_la_LIBADD = $(hangul_xft_libadd) +pango_hangul_xft_la_LIBADD = $(pangoxftlibs) pango_hangul_xft_la_SOURCES = $(xft_sources) - libpango_hangul_xft_la_SOURCES = $(xft_sources) + EXTRA_DIST = \ tables-ksc5601.i \ tables-johabfont.i \ diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index bbf346f2..8cc7fa7c 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -1,99 +1,78 @@ ## Process this file with automake to create Makefile.in. -common_sources = hebrew-shaper.c hebrew-shaper.h -hebrew_x_sources = $(common_sources) hebrew-x.c -hebrew_xft_sources = $(common_sources) hebrew-xft.c -hebrew_ft2_sources = $(common_sources) hebrew-ft2.c - pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_BASIC_XFT -XFT_INCLUDED=libpango-hebrew-xft.la -XFT_MODULES= -XFT_PREFIX=-DXFT_MODULE_PREFIX +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +common_sources = hebrew-shaper.c hebrew-shaper.h + +if HAVE_X +INCLUDES += $(X_CFLAGS) +if INCLUDE_HEBREW_X +noinst_LTLIBRARIES += libpango-hebrew-x.la +INCLUDES += -DX_MODULE_PREFIX else -XFT_INCLUDED= -XFT_MODULES=pango-hebrew-xft.la -XFT_PREFIX= -hebrew_xft_libadd=$(pangoxlibs) $(pangoxftlibs) +module_LTLIBRARIES += pango-hebrew-x.la endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= endif -if HAVE_X -if INCLUDE_BASIC_X -X_INCLUDED=libpango-hebrew-x.la -X_MODULES= -X_PREFIX=-DX_MODULE_PREFIX +hebrew_x_sources = $(common_sources) hebrew-x.c + +pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hebrew_x_la_LIBADD = $(pangoxlibs) +pango_hebrew_x_la_SOURCES = $(hebrew_x_sources) +libpango_hebrew_x_la_SOURCES = $(hebrew_x_sources) + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_HEBREW_XFT +noinst_LTLIBRARIES += libpango-hebrew-xft.la +INCLUDES += -DXFT_MODULE_PREFIX else -X_INCLUDED= -X_MODULES=pango-hebrew-x.la -X_PREFIX= -hebrew_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-hebrew-xft.la endif -else -X_INCLUDED= -X_MODULES= -X_PREFIX= endif +hebrew_xft_sources = $(common_sources) hebrew-xft.c + +pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hebrew_xft_la_LIBADD = $(pangoxftlibs) +pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) +libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) + + if HAVE_FREETYPE -if INCLUDE_BASIC_FT2 -FT2_INCLUDED=libpango-hebrew-ft2.la -FT2_MODULES= -FT2_PREFIX=-DFT2_MODULE_PREFIX +INCLUDES += $(FREETYPE_CFLAGS) +if INCLUDE_HEBREW_FT2 +noinst_LTLIBRARIES += libpango-hebrew-ft2.la +INCLUDES += -DFT2_MODULE_PREFIX else -FT2_INCLUDED= -FT2_MODULES=pango-hebrew-ft2.la -FT2_PREFIX= -hebrew_ft2_libadd=$(pangoft2libs) +module_LTLIBRARIES += pango-hebrew-ft2.la endif -else -FT2_MODULES= -FT2_INCLUDED= -FT2_PREFIX= endif if PLATFORM_WIN32 no_undefined = -no-undefined endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(FT2_INCLUDED) $(XFT_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(FT2_MODULES) $(XFT_MODULES) -moddefine = $(X_PREFIX) $(FT2_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ - $(moddefine) - -pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_hebrew_x_la_LIBADD = $(hebrew_x_libadd) -pango_hebrew_x_la_SOURCES = $(hebrew_x_sources) -libpango_hebrew_x_la_SOURCES = $(hebrew_x_sources) - -pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_hebrew_xft_la_LIBADD = $(hebrew_xft_libadd) -pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) -libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources) +hebrew_ft2_sources = $(common_sources) hebrew-ft2.c pango_hebrew_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) -pango_hebrew_ft2_la_LIBADD = $(hebrew_ft2_libadd) +pango_hebrew_ft2_la_LIBADD = $(pangoft2libs) pango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources) libpango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources) diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index f58ad78d..4df9443f 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -1,155 +1,109 @@ ## Process this file with automake to create Makefile.in. -sources = \ - myanmar-x.c \ - gurmukhi-x.c \ - bengali-x.c \ - gujarati-x.c \ - devanagari-x.c \ - pango-indic-script.h - -xft_sources = \ - indic-xft.c \ - indic-ot-class-tables.c \ - indic-ot.c \ - indic-ot.h - pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_INDIC_XFT -indic_xft_inst= -indic_xft_noinst=libpango-indic-xft.la -indic_xft_cflags=-DXFT_MODULE_PREFIX $(FREETYPE_CFLAGS) -else -indic_xft_inst=pango-indic-xft.la -indic_xft_noinst= -indic_xft_cflags= $(FREETYPE_CFLAGS) -indic_xft_libadd=$(pangoxftlibs) -endif -else -indic_xft_inst= -indic_xft_noints= -indic_xft_cflags= -endif +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) -if HAVE_X +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_MYANMAR_X -myanmar_x_noinst=libpango-myanmar-x.la -myanmar_x_cflags=-DMYANMAR_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-myanmar-x.la +INCLUDES += -DMYANMAR_X_MODULE_PREFIX else -myanmar_x_inst=pango-myanmar-x.la -myanmar_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-myanmar-x.la endif if INCLUDE_GURMUKHI_X -gurmukhi_x_noinst=libpango-gurmukhi-x.la -gurmukhi_x_cflags=-DGURMUKHI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-gurmukhi-x.la +INCLUDES += -DGURMUKHI_X_MODULE_PREFIX else -gurmukhi_x_inst=pango-gurmukhi-x.la -gurmukhi_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-gurmukhi-x.la endif if INCLUDE_BENGALI_X -bengali_x_noinst=libpango-bengali-x.la -bengali_x_cflags=-DBENGALI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-bengali-x.la +INCLUDES += -DBENGALI_X_MODULE_PREFIX else -bengali_x_inst=pango-bengali-x.la -bengali_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-bengali-x.la endif if INCLUDE_DEVANAGARI_X -devanagari_x_noinst=libpango-devanagari-x.la -devanagari_x_cflags=-DDEVANAGARI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-devanagari-x.la +INCLUDES += -DDEVANAGARI_X_MODULE_PREFIX else -devanagari_x_inst=pango-devanagari-x.la -devanagari_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-devanagari-x.la endif if INCLUDE_GUJARATI_X -gujarati_x_noinst=libpango-gujarati-x.la -gujarati_x_cflags=-DGUJARATI_X_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-gujarati-x.la +INCLUDES += -DGUJARATI_X_MODULE_PREFIX else -gujarati_x_inst=pango-gujarati-x.la -gujarati_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-gujarati-x.la endif - -noinst_LTLIBRARIES = $(myanmar_x_noinst) $(gurmukhi_x_noinst) $(bengali_x_noinst) $(devanagari_x_noinst) $(gujarati_x_noinst) $(indic_xft_noinst) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(devanagari_x_inst) $(gujarati_x_inst) $(indic_xft_inst) - endif -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(X_CFLAGS) \ - $(myanmar_x_cflags) \ - $(gurmukhi_x_cflags) \ - $(bengali_x_cflags) \ - $(devanagari_x_cflags) \ - $(gujarati_x_cflags) \ - $(indic_xft_cflags) - -EXTRA_DIST = \ - pango-indic-script.h - pango_devanagari_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_devanagari_x_la_LIBADD = $(devanagari_x_libadd) -if INCLUDE_DEVANAGARI_X -libpango_devanagari_x_la_SOURCES = devanagari-x.c -else -pango_devanagari_x_la_SOURCES = devanagari-x.c -endif +pango_devanagari_x_la_LIBADD = $(pangoxlibs) +pango_devanagari_x_la_SOURCES = devanagari-x.c pango-indic-script.h +libpango_devanagari_x_la_SOURCES = devanagari-x.c pango-indic-script.h pango_myanmar_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_myanmar_x_la_LIBADD = $(myanmar_x_libadd) -if INCLUDE_MYANMAR_X -libpango_myanmar_x_la_SOURCES = myanmar-x.c -else -pango_myanmar_x_la_SOURCES = myanmar-x.c -endif +pango_myanmar_x_la_LIBADD = $(pangoxlibs) +pango_myanmar_x_la_SOURCES = myanmar-x.c pango-indic-script.h +libpango_myanmar_x_la_SOURCES = myanmar-x.c pango-indic-script.h pango_gurmukhi_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_gurmukhi_x_la_LIBADD = $(gurmukhi_x_libadd) -if INCLUDE_GURMUKHI_X -libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c -else -pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c -endif +pango_gurmukhi_x_la_LIBADD = $(pangoxlibs) +pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c pango-indic-script.h +libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c pango-indic-script.h pango_bengali_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_bengali_x_la_LIBADD = $(bengali_x_libadd) -if INCLUDE_BENGALI_X -libpango_bengali_x_la_SOURCES = bengali-x.c -else -pango_bengali_x_la_SOURCES = bengali-x.c -endif +pango_bengali_x_la_LIBADD = $(pangoxlibs) +pango_bengali_x_la_SOURCES = bengali-x.c pango-indic-script.h +libpango_bengali_x_la_SOURCES = bengali-x.c pango-indic-script.h pango_gujarati_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_gujarati_x_la_LIBADD = $(gujarati_x_libadd) -if INCLUDE_GUJARATI_X -libpango_gujarati_x_la_SOURCES = gujarati-x.c +pango_gujarati_x_la_LIBADD = $(pangoxlibs) +pango_gujarati_x_la_SOURCES = gujarati-x.c pango-indic-script.h +libpango_gujarati_x_la_SOURCES = gujarati-x.c pango-indic-script.h + + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_INDIC_XFT +noinst_LTLIBRARIES += libpango-indic-xft.la +INCLUDES += -DXFT_MODULE_PREFIX else -pango_gujarati_x_la_SOURCES = gujarati-x.c +module_LTLIBRARIES += pango-indic-xft.la +endif endif +xft_sources = \ + indic-xft.c \ + indic-ot-class-tables.c \ + indic-ot.c \ + indic-ot.h + pango_indic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_indic_xft_la_LIBADD = $(indic_xft_libadd) +pango_indic_xft_la_LIBADD = $(pangoxftlibs) pango_indic_xft_la_SOURCES = $(xft_sources) - libpango_indic_xft_la_SOURCES = $(xft_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index 4b18fbb4..c3ecaf25 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -4,49 +4,38 @@ pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIB pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -x_sources = \ - tamil-x.c \ - tadefs.h +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_TAMIL_X -X_MODULES= -X_INCLUDED=libpango-tamil-x.la -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-tamil-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_MODULES=pango-tamil-x.la -X_INCLUDED= -X_PREFIX= -tamil_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-tamil-x.la endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= endif -noinst_LTLIBRARIES = $(X_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) -moddefine = $(X_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) +x_sources = \ + tamil-x.c \ + tadefs.h pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_tamil_x_la_LIBADD = $(tamil_x_libadd) +pango_tamil_x_la_LIBADD = $(pangoxlibs) pango_tamil_x_la_SOURCES = $(x_sources) - libpango_tamil_x_la_SOURCES = $(x_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 6e27c439..7b66a756 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -1,77 +1,61 @@ ## Process this file with automake to create Makefile.in. -common_sources = thai-shaper.c thai-shaper.h -thai_x_sources = $(common_sources) thai-x.c -thai_xft_sources = $(common_sources) thai-xft.c - pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -if HAVE_XFT -if INCLUDE_THAI_XFT -XFT_MODULES= -XFT_INCLUDED=libpango-thai-xft.la -XFT_PREFIX=-DXFT_MODULE_PREFIX -else -XFT_MODULES=pango-thai-xft.la -XFT_INCLUDED= -XFT_PREFIX= -thai_xft_libadd=$(pangoxftlibs) -endif -else -XFT_MODULES= -XFT_INCLUDED= -XFT_PREFIX= -endif +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) + +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules +module_LTLIBRARIES = +noinst_LTLIBRARIES = + +common_sources = thai-shaper.c thai-shaper.h + if HAVE_X +INCLUDES += $(X_CFLAGS) if INCLUDE_THAI_X -X_MODULES= -X_INCLUDED=libpango-thai-x.la -X_PREFIX=-DX_MODULE_PREFIX +noinst_LTLIBRARIES += libpango-thai-x.la +INCLUDES += -DX_MODULE_PREFIX else -X_MODULES=pango-thai-x.la -X_INCLUDED= -X_PREFIX= -thai_x_libadd=$(pangoxlibs) +module_LTLIBRARIES += pango-thai-x.la endif -else -X_MODULES= -X_INCLUDED= -X_PREFIX= endif -noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) -module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) -moddefine = $(X_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules - -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(moddefine) \ - $(GLIB_CFLAGS) \ - $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) +thai_x_sources = $(common_sources) thai-x.c pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_thai_x_la_LIBADD = $(thai_x_libadd) +pango_thai_x_la_LIBADD = $(pangoxlibs) pango_thai_x_la_SOURCES = $(thai_x_sources) - libpango_thai_x_la_SOURCES = $(thai_x_sources) + +if HAVE_XFT +INCLUDES += $(XFT_CFLAGS) +if INCLUDE_THAI_XFT +noinst_LTLIBRARIES += libpango-thai-xft.la +INCLUDES += -DXFT_MODULE_PREFIX +else +module_LTLIBRARIES += pango-thai-xft.la +endif +endif + +thai_xft_sources = $(common_sources) thai-xft.c + pango_thai_xft_la_LDFLAGS = -export-dynamic -avoid-version -module -pango_thai_xft_la_LIBADD = $(thai_xft_libadd) +pango_thai_xft_la_LIBADD = $(pangoxftlibs) pango_thai_xft_la_SOURCES = $(thai_xft_sources) - libpango_thai_xft_la_SOURCES = $(thai_xft_sources) + included-modules: $(noinst_LTLIBRARIES) .PHONY: included-modules diff --git a/pango/Makefile.am b/pango/Makefile.am index 6a4ca6a2..b0702b26 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -32,94 +32,31 @@ INCLUDES = \ $(X_CFLAGS) \ -I$(top_srcdir) -if HAVE_X -X_HFILES=pangox.h -X_BUILD_LIBS=libpangox-1.0.la -else -X_HFILES= -X_BUILD_LIBS= -endif - -if HAVE_WIN32 -WIN32_HFILES=pangowin32.h -WIN32_BUILD_LIBS=libpangowin32-1.0.la -else -WIN32_HFILES= -WIN32_BUILD_LIBS= -endif +BUILT_SOURCES = pango-enum-types.h pango-enum-types.c -if HAVE_XFT -XFT_HFILES=pangoxft.h pango-ot.h -XFT_BUILD_LIBS=libpangoxft-1.0.la -else -XFT_HFILES= -XFT_BUILD_LIBS= -endif - -if HAVE_FREETYPE -FT2_HFILES=pangoft2.h pango-ot.h -FT2_BUILD_LIBS=libpangoft2-1.0.la -else -FT2_HFILES= -FT2_BUILD_LIBS= -endif +pangoincludedir=$(includedir)/pango-1.0/pango if PLATFORM_WIN32 no_undefined = -no-undefined endif -if OS_WIN32 -pango_export_symbols = -export-symbols pango.def -pangowin32_export_symbols = -export-symbols pangowin32.def -pangoft2_export_symbols = -export-symbols pangoft2.def -pango_win32res = pango-win32res.lo -pangowin32_win32res = pangowin32-win32res.lo -pangoft2_win32res = pangoft2-win32res.lo +# ------------------- libpango ------------------- -install-libtool-import-lib: - $(INSTALL) .libs/libpango-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) -if HAVE_FREETYPE - $(INSTALL) .libs/libpangoft2-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) -endif - $(INSTALL) .libs/libpangowin32-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) -uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libpango-$(PANGO_API_VERSION).dll.a - -rm $(DESTDIR)$(libdir)/libpangoft2-$(PANGO_API_VERSION).dll.a - -rm $(DESTDIR)$(libdir)/libpangowin32-$(PANGO_API_VERSION).dll.a -else -install-libtool-import-lib: -uninstall-libtool-import-lib: +lib_LTLIBRARIES = libpango-1.0.la +libpango_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) +libpango_1_0_la_LIBADD = $(GLIB_LIBS) +if !HAVE_FRIBIDI +libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la endif -lib_LTLIBRARIES = libpango-1.0.la $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS) - -if MS_LIB_AVAILABLE -noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib - -install-ms-lib: - $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) -if HAVE_FREETYPE - $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) -endif - $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib - -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib - -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib -else -install-ms-lib: -uninstall-ms-lib: +if OS_WIN32 +libpango_1_0_la_LDFLAGS += -export-symbols pango.def +libpango_1_0_la_LIBADD += pango-win32res.lo endif - -bin_PROGRAMS = pango-querymodules - -pango_built_headers = pango-enum-types.h -pango_built_cfiles = pango-enum-types.c - -$(OBJECTS) $(libpango_1_0_la_OBJECTS): $(pango_built_headers) +pango-win32res.lo: pango.rc + $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ libpango_1_0_la_SOURCES = \ break.c \ @@ -143,82 +80,9 @@ libpango_1_0_la_SOURCES = \ pango-utils.c \ reorder-items.c \ shape.c \ - $(pango_built_cfiles) - -libpangox_1_0_la_SOURCES = \ - modules.h \ - module-defs-x.c \ - pangox.c \ - pangox-private.h \ - pangox-fontcache.c \ - pangox-fontmap.c \ - pango-indic.c - -libpango_1_0_la_LDFLAGS = \ - -version-info $(LT_VERSION_INFO) \ - $(GLIB_LIBS) \ - $(no_undefined) $(pango_export_symbols) - -if HAVE_FRIBIDI -libpango_1_0_la_LIBADD = $(pango_win32res) -else -libpango_1_0_la_LIBADD = mini-fribidi/libmini-fribidi.la $(pango_win32res) -endif -libpango_1_0_la_DEPENDENCIES = $(pango_win32res) - -libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) -libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la - -pango-win32res.lo : pango.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource pango.rc pango-win32res.lo - -libpangowin32_1_0_la_SOURCES = \ - pangowin32.h \ - pangowin32.c \ - pangowin32-private.h \ - pangowin32-fontcache.c \ - pangowin32-fontmap.c \ - module-defs-win32.c - -libpangowin32_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ - $(GLIB_LIBS) \ - $(no_undefined) $(pangowin32_export_symbols) -libpangowin32_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) $(pangowin32_win32res) -libpangowin32_1_0_la_DEPENDENCIES = $(INCLUDED_WIN32_MODULES) libpango-$(PANGO_API_VERSION).la $(pangowin32_win32res) - -pangowin32-win32res.lo : pangowin32.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource pangowin32.rc pangowin32-win32res.lo - -libpangoxft_1_0_la_SOURCES = \ - pangoxft-font.c \ - pangoxft-fontmap.c \ - pangoxft-private.h \ - module-defs-xft.c + pango-enum-types.c -libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) -libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango-$(PANGO_API_VERSION).la - -libpangoft2_1_0_la_SOURCES = \ - pangoft2.h \ - pangoft2.c \ - pangoft2-private.h \ - pangoft2-fontmap.c \ - module-defs-ft2.c - -libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ - $(GLIB_LIBS) \ - $(no_undefined) $(pangoft2_export_symbols) -libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FONTCONFIG_LIBS) $(pangoft2_win32res) -libpangoft2_1_0_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango-$(PANGO_API_VERSION).la - -pangoft2-win32res.lo : pangoft2.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource pangoft2.rc pangoft2-win32res.lo - -pangoincludedir=$(includedir)/pango-1.0/pango - -pango_headers= \ +pango_headers = \ pango.h \ pango-attributes.h \ pango-break.h \ @@ -238,17 +102,12 @@ pango_headers= \ pango-types.h \ pango-utils.h -pangoinclude_HEADERS = \ - $(pango_headers) \ - $(pango_built_headers) \ - $(X_HFILES) \ - $(XFT_HFILES) \ - $(FT2_HFILES) \ - $(WIN32_HFILES) +pangoinclude_HEADERS = \ + $(pango_headers) \ + pango-enum-types.h pango-enum-types.h: s-enum-types-h @true - s-enum-types-h: @REBUILD@ $(pango_headers) Makefile ( cd $(srcdir) && glib-mkenums \ --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ @@ -256,13 +115,12 @@ s-enum-types-h: @REBUILD@ $(pango_headers) Makefile --vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __PANGO_ENUM_TYPES_H__ */" \ $(pango_headers) ) > tmp-pango-enum-types.h \ - && (cmp -s tmp-pango-enum-types.h $(srcdir)/pango-enum-types.h || cp tmp-pango-enum-types.h $(srcdir)/pango-enum-types.h ) \ + && (cmp -s tmp-pango-enum-types.h pango-enum-types.h || cp tmp-pango-enum-types.h pango-enum-types.h ) \ && rm -f tmp-pango-enum-types.h \ && echo timestamp > $(@F) pango-enum-types.c: s-enum-types-c @true - s-enum-types-c: @REBUILD@ $(pango_headers) Makefile ( cd $(srcdir) && glib-mkenums \ --fhead "#include <pango.h>" \ @@ -271,26 +129,180 @@ s-enum-types-c: @REBUILD@ $(pango_headers) Makefile --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ $(pango_headers) ) > tmp-pango-enum-types.c \ - && (cmp -s tmp-pango-enum-types.c $(srcdir)/pango-enum-types.c || cp tmp-pango-enum-types.c $(srcdir)/pango-enum-types.c ) \ + && (cmp -s tmp-pango-enum-types.c pango-enum-types.c || cp tmp-pango-enum-types.c pango-enum-types.c ) \ && rm -f tmp-pango-enum-types.c \ && echo timestamp > $(@F) + +# ------------------- libpangox ------------------- + +if HAVE_X +pangoinclude_HEADERS += pangox.h +lib_LTLIBRARIES += libpangox-1.0.la +endif + +libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) +libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) +libpangox_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) + +libpangox_1_0_la_SOURCES = \ + modules.h \ + module-defs-x.c \ + pangox.c \ + pangox-private.h \ + pangox-fontcache.c \ + pangox-fontmap.c \ + pango-indic.c + + +# ------------------- libpangoxft ------------------- + +if HAVE_XFT +pangoinclude_HEADERS += pangoxft.h pango-ot.h +lib_LTLIBRARIES += libpangoxft-1.0.la +endif + +libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) +libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) +libpangoxft_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) + +libpangoxft_1_0_la_SOURCES = \ + pangoxft-font.c \ + pangoxft-fontmap.c \ + pangoxft-private.h \ + module-defs-xft.c + + +# ------------------- libpangoft2 ------------------- + +if HAVE_FREETYPE +pangoinclude_HEADERS += pangoft2.h pango-ot.h +lib_LTLIBRARIES += libpangoft2-1.0.la +endif + +libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) +libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FONTCONFIG_LIBS) $(GLIB_LIBS) +libpangoft2_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) + +libpangoft2_1_0_la_SOURCES = \ + pangoft2.h \ + pangoft2.c \ + pangoft2-private.h \ + pangoft2-fontmap.c \ + module-defs-ft2.c + +if OS_WIN32 +libpangoft2_1_0_la_LDFLAGS += -export-symbols pangoft2.def +libpangoft2_1_0_la_LIBADD += pangoft2-win32res.lo +libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32res.lo +endif +pangoft2-win32res.lo: pangoft2.rc + $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ + + +# ------------------- libpangowin32 ------------------- + +if HAVE_WIN32 +pangoinclude_HEADERS += pangowin32.h +lib_LTLIBRARIES += libpangowin32-1.0.la +endif + +libpangowin32_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) +libpangowin32_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) $(GLIB_LIBS) +libpangowin32_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES) + +libpangowin32_1_0_la_SOURCES = \ + pangowin32.h \ + pangowin32.c \ + pangowin32-private.h \ + pangowin32-fontcache.c \ + pangowin32-fontmap.c \ + module-defs-win32.c + +if OS_WIN32 +libpangowin32_1_0_la_LDFLAGS += -export-symbols pangowin32.def +libpangowin32_1_0_la_LIBADD += pangowin32-win32res.lo +libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32res.lo +endif +pangowin32-win32res.lo: pangowin32.rc + $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ + + +# ------------------- win32 build stuff ------------------- + +if OS_WIN32 +install-libtool-import-lib: + $(INSTALL) .libs/libpango-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) +if HAVE_FREETYPE + $(INSTALL) .libs/libpangoft2-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) +endif + $(INSTALL) .libs/libpangowin32-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libpango-$(PANGO_API_VERSION).dll.a + -rm $(DESTDIR)$(libdir)/libpangoft2-$(PANGO_API_VERSION).dll.a + -rm $(DESTDIR)$(libdir)/libpangowin32-$(PANGO_API_VERSION).dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: + +endif + +if MS_LIB_AVAILABLE +noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib + +install-ms-lib: + $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) +if HAVE_FREETYPE + $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) +endif + $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib + -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib + -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib +else +install-ms-lib: +uninstall-ms-lib: +endif + +pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la pango.def + lib -name:libpango-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:pango.def -out:$@ + +pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la pangoft2.def + lib -name:libpangoft2-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:pangoft2.def -out:$@ + +pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la pangowin32.def + lib -name:libpangowin32-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:pangowin32.def -out:$@ + + +# ------------------- pango-querymodules ------------------- + +bin_PROGRAMS = pango-querymodules + # # As a temporary hack, we pull in libpangox here so that we can link # pango_querymodules_SOURCES = \ querymodules.c +pango_querymodules_LDADD = +if HAVE_X +pango_querymodules_LDADD += libpangox-$(PANGO_API_VERSION).la +endif if HAVE_XFT -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS) -pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la -else -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FONTCONFIG_LIBS) $(X_EXTRA_LIBS) -pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la +pango_querymodules_LDADD += libpangoxft-$(PANGO_API_VERSION).la +endif +if HAVE_FREETYPE +pango_querymodules_LDADD += libpangoft2-$(PANGO_API_VERSION).la endif +if HAVE_WIN32 +pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la +endif +pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) EXTRA_DIST = \ - $(pango_built_headers) \ + pango-enum-types.h \ module-defs-ft2.c.win32 \ module-defs-win32.c.win32 \ module-defs.h \ @@ -317,20 +329,28 @@ $(INCLUDED_X_MODULES) $(INCLUDED_XFT_MODULES) $(INCLUDED_FT2_MODULES) $(INCLUDED .PHONY: included-modules endif -CLEANFILES = \ - pango-enum-types.h \ - s-enum-types-h \ - pango-enum-types.c \ - s-enum-types-c - -pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la pango.def - lib -name:libpango-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:pango.def -out:$@ - -pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la pangoft2.def - lib -name:libpangoft2-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:pangoft2.def -out:$@ +module-defs.h: $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status pango/$@ +module-defs-x.c: $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status pango/$@ +module-defs-xft.c: $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status pango/$@ +module-defs-ft2.c: $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status pango/$@ +module-defs-win32.c: $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status pango/$@ + +CLEANFILES = \ + pango-enum-types.h \ + s-enum-types-h \ + pango-enum-types.c \ + s-enum-types-c \ + module-defs.h \ + module-defs-x.c \ + module-defs-xft.c \ + module-defs-ft2.c \ + module-defs-win32.c -pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la pangowin32.def - lib -name:libpangowin32-$(PANGO_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:pangowin32.def -out:$@ install-data-local: install-ms-lib install-libtool-import-lib diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index 3acf7546..969b2dbc 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -11,12 +11,11 @@ INCLUDES = \ $(X_CFLAGS) \ -I$(top_srcdir) -LDADDS = @STRIP_BEGIN@ \ - @x_ldflags@ \ - @x_libs@ \ - @GLIB_LIBS@ \ - -lm \ -@STRIP_END@ +LDADDS = \ + $(x_ldflags) \ + $(x_libs) \ + $(GLIB_LIBS) \ + -lm noinst_LTLIBRARIES = libpango-ot.la diff --git a/tests/Makefile.am b/tests/Makefile.am index 513e46b0..ac4d0bb2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,29 +1,5 @@ ## Process this file with automake to create Makefile.in. -if HAVE_XFT -X_DEFINES=-DHAVE_X -else -X_DEFINES= -endif - -if HAVE_XFT -XFT_DEFINES=-DHAVE_XFT -else -XFT_DEFINES= -endif - -if HAVE_FREETYPE -FT2_DEFINES=-DHAVE_FREETYPE -else -FT2_DEFINES= -endif - -if HAVE_WIN32 -WIN32_DEFINES=-DHAVE_WIN32 -else -WIN32_DEFINES= -endif - INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ @@ -31,18 +7,28 @@ INCLUDES = \ $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ - $(X_DEFINES) \ - $(XFT_DEFINES) \ - $(FT2_DEFINES) \ - $(WIN32_DEFINES) \ -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) +if HAVE_XFT +INCLUDES += -DHAVE_X +endif +if HAVE_XFT +INCLUDES += -DHAVE_XFT +endif +if HAVE_FREETYPE +INCLUDES += -DHAVE_FREETYPE +endif +if HAVE_WIN32 +INCLUDES += -DHAVE_WIN32 +endif + + TESTS=runtests.sh noinst_PROGRAMS = gen-all-unicode dump-boundaries -check_PROGRAMS = testboundaries testcolor $(CXX_TEST) +check_PROGRAMS = testboundaries testcolor gen_all_unicode_SOURCES = gen-all-unicode.c @@ -61,11 +47,10 @@ testcolor_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la dump_boundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la if HAVE_CXX -CXX_TEST = cxx-test -cxx_test_SOURCES = cxx-test.C -else -CXX_TEST = +check_PROGRAMS += cxx-test endif +cxx_test_SOURCES = cxx-test.C + EXTRA_DIST = \ all-unicode.txt \ @@ -77,3 +62,4 @@ all-unicode.txt: gen-all-unicode all-local: all-unicode.txt +DISTCLEANFILES = all-unicode.txt runtests.log |