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, 59 insertions, 86 deletions

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	\