diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-13 19:03:39 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-13 19:03:39 +0000 |
commit | 55c263e39be388808c7bd6d275c847449b57a3a1 (patch) | |
tree | a3547dd07c984d19f943304c3c6bd394dfea78d1 /modules/basic | |
parent | 74565226a4312f72192773bcaca97409ca4c2954 (diff) | |
download | pango-55c263e39be388808c7bd6d275c847449b57a3a1.tar.gz |
Pass 1.6 and gnu options to automake.
2006-02-13 Behdad Esfahbod <behdad@gnome.org>
* configure.in: Pass 1.6 and gnu options to automake.
* modules/Makefile.am: Distribute Module.mk.
* modules/Module.mk: Common bits for writing module Makefil.am's.
* modules/*/Makefile.am: Include Module.mk instead of copying common
bits.
Diffstat (limited to 'modules/basic')
-rw-r--r-- | modules/basic/Makefile.am | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index f3a35aed..422360ed 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -1,24 +1,4 @@ -## Process this file with automake to create Makefile.in. - -basic_sources = basic-x.c - -pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs) -pangoatsuilibs = $(top_builddir)/pango/libpangocairo-$(PANGO_API_VERSION).la $(pangolibs) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -module_LTLIBRARIES = -noinst_LTLIBRARIES = +include $(top_srcdir)/modules/Module.mk if HAVE_X INCLUDES += $(X_CFLAGS) @@ -101,8 +81,3 @@ EXTRA_DIST = \ basic-common.h \ tables-big.i \ tables-small.i - -included-modules: $(noinst_LTLIBRARIES) -dynamic-modules: $(module_LTLIBRARIES) - -.PHONY: included-modules dynamic-modules |