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 /Makefile.am | |
| 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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 40 |
1 files changed, 10 insertions, 30 deletions
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 |