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.

1 files changed, 35 insertions, 51 deletions

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