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, 60 insertions, 106 deletions

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