Require libtool 1.4 when build out of CVS.

Tue May  1 16:03:48 2001  Owen Taylor  <otaylor@redhat.com>

	* autogen.sh (libtool_version): Require libtool 1.4 when
	build out of CVS.

	* **/Makefile.am: Add inter-library dependencies,
        especially for the modules. Many cleanups to the
        module makefiles.

	* configure.in modules/indic/Makefile.am: Remove
	INCLUDE_ANY_INDIC conditional which doesn't seem to have
	any point and was definitely suspect as done.

	* modules/tamil/tamil-xft.c (MODULE_ENTRY): Fix prefix
	to be _pango_tamil instead of _pango_basic.

	* Makefile.am: Build modules/ after pango/ so we can
	make the modules depend on libpango/libpangox.

	* examples/Makefile.am: Remove spurious rule to rebuild
	makefile.mingw.

9 files changed, 116 insertions, 39 deletions

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 3a04076b..999912f7 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,3 +11,11 @@ SUBDIRS = 		\
 
 EXTRA_DIST =		\
 	module.def
+
+included-modules:
+	@for d in $(SUBDIRS) ; do \
+		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
+        done
+
+.PHONY: included-modules
+
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 4516fa99..9f431a27 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -1,13 +1,20 @@
 ## Process this file with automake to create Makefile.in.
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_XFT
-XFT_MODULES=pango-arabic-xft.la
 if INCLUDE_ARABIC_XFT
+XFT_MODULES=
 XFT_INCLUDED=libpango-arabic-xft.la
 XFT_PREFIX=-DXFT_MODULE_PREFIX
 else
+XFT_MODULES=pango-arabic-xft.la
 XFT_INCLUDED=
 XFT_PREFIX=
+arabic_xft_libadd=$(pangoxftlibs)
 endif
 else
 XFT_MODULES=
@@ -40,6 +47,7 @@ else
 X_MODULES=pango-arabic-x.la
 X_INCLUDED=
 X_PREFIX=
+arabic_x_libadd=$(pangoxlibs)
 endif
 else
 X_MODULES=
@@ -51,19 +59,21 @@ noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
 moduledir = $(libdir)/pango/modules
-moduleflags=-rpath $(libdir)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
-pango_arabic_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_x_la_LIBADD = $(arabic_x_libadd)
 pango_arabic_x_la_SOURCES = $(x_sources)
 
 libpango_arabic_x_la_SOURCES = $(x_sources)
 
-pango_arabic_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_arabic_xft_la_LIBADD = 
+pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_xft_la_LIBADD = $(arabic_xft_libadd)
 pango_arabic_xft_la_SOURCES = $(xft_sources)
 
 libpango_arabic_xft_la_SOURCES = $(xft_sources)
 
+included-modules: $(noinst_LTLIBRARIES)
 
+.PHONY: included-modules
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 07001520..f8fe78c5 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -2,6 +2,11 @@
 
 basic_sources = basic-x.c
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_XFT
 if INCLUDE_BASIC_XFT
 XFT_INCLUDED=libpango-basic-xft.la
@@ -11,6 +16,7 @@ else
 XFT_INCLUDED=
 XFT_MODULES=pango-basic-xft.la
 XFT_PREFIX=
+basic_xft_libadd=$(pangoxlibs)
 endif
 else
 XFT_MODULES=
@@ -27,6 +33,7 @@ else
 FT2_INCLUDED=
 FT2_MODULES=pango-basic-ft2.la
 FT2_PREFIX=
+basic_ft2_libadd=$(pangoft2libs)
 endif
 else
 FT2_MODULES=
@@ -43,6 +50,7 @@ else
 X_INCLUDED=
 X_MODULES=pango-basic-x.la
 X_PREFIX=
+basic_x_libadd=$(pangoxlibs)
 endif
 else
 X_INCLUDED=
@@ -54,7 +62,6 @@ noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX)
 moduledir = $(libdir)/pango/modules
-moduleflags=-rpath $(libdir)
 
 INCLUDES = 			\
 	-I$(top_srcdir) 	\
@@ -63,18 +70,18 @@ INCLUDES = 			\
 	$(FREETYPE_CFLAGS)	\
 	$(moddefine)
 
-pango_basic_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
-pango_basic_x_la_LIBADD = 
+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 = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_basic_xft_la_LIBADD = 
+pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_basic_xft_la_LIBADD = $(basic_xft_libadd)
 pango_basic_xft_la_SOURCES = basic-xft.c
 libpango_basic_xft_la_SOURCES = basic-xft.c
 
-pango_basic_ft2_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_basic_ft2_la_LIBADD =  $(FREETYPE_LIBS)
+pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_basic_ft2_la_LIBADD = $(basic_ft2_libadd)
 pango_basic_ft2_la_SOURCES = basic-ft2.c
 libpango_basic_ft2_la_SOURCES = basic-ft2.c
 
@@ -85,3 +92,6 @@ EXTRA_DIST =		\
 	makefile.mingw	\
 	makefile.mingw.in
 
+included-modules: $(noinst_LTLIBRARIES)
+
+.PHONY: included-modules
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index e82c1a17..9f8e2752 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -2,6 +2,11 @@
 
 sources = hangul-x.c
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_X
 if INCLUDE_HANGUL_X
 noinst_LTLIBRARIES = libpango-hangul-x.la
@@ -9,17 +14,22 @@ moddefine = -DX_MODULE_PREFIX
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-hangul-x.la
-moduleflags= -rpath $(libdir)
+hangul_x_libadd = $(pangoxlibs)
 endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_hangul_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_hangul_x_la_SOURCES = $(sources)
+pango_hangul_x_la_LIBADD = $(hangul_x_libadd)
 
 libpango_hangul_x_la_SOURCES = $(sources)
 
 EXTRA_DIST =			\
 	tables-ksc5601.i	\
 	tables-johabfont.i
+
+included-modules: $(noinst_LTLIBRARIES)
+
+.PHONY: included-modules
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index ce925aec..0aad3db7 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -2,6 +2,11 @@
 
 sources = hebrew-x.c
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_X
 if INCLUDE_HEBREW_X
 noinst_LTLIBRARIES = libpango-hebrew-x.la
@@ -9,15 +14,18 @@ moddefine = -DX_MODULE_PREFIX
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-hebrew-x.la
-moduleflags=-rpath $(libdir)
+hebrew_x_libadd=$(pangoxlibs)
 endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_hebrew_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
-pango_hebrew_x_la_LIBADD =
+pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_hebrew_x_la_LIBADD = $(hebrew_x_libadd)
 pango_hebrew_x_la_SOURCES = $(sources)
 
 libpango_hebrew_x_la_SOURCES = $(sources)
 
+included-modules: $(noinst_LTLIBRARIES)
+
+.PHONY: included-modules
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 7fde2ba9..8fe3dd8a 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -8,6 +8,11 @@ sources =		 	\
 	devanagari-x.c		\
 	pango-indic-script.h
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_X
 
 if INCLUDE_MYANMAR_X
@@ -15,7 +20,7 @@ myanmar_x_noinst=libpango-myanmar-x.la
 myanmar_x_cflags=-DMYANMAR_X_MODULE_PREFIX
 else
 myanmar_x_inst=pango-myanmar-x.la
-myanmar_x_moduleflags=-rpath $(libdir)
+myanmar_x_libadd=$(pangoxlibs)
 endif
 
 if INCLUDE_GURMUKHI_X
@@ -23,7 +28,7 @@ gurmukhi_x_noinst=libpango-gurmukhi-x.la
 gurmukhi_x_cflags=-DGURMUKHI_X_MODULE_PREFIX
 else
 gurmukhi_x_inst=pango-gurmukhi-x.la
-gurmukhi_x_moduleflags=-rpath $(libdir)
+gurmukhi_x_libadd=$(pangoxlibs)
 endif
 
 if INCLUDE_BENGALI_X
@@ -31,7 +36,7 @@ bengali_x_noinst=libpango-bengali-x.la
 bengali_x_cflags=-DBENGALI_X_MODULE_PREFIX
 else
 bengali_x_inst=pango-bengali-x.la
-bengali_x_moduleflags=-rpath $(libdir)
+bengali_x_libadd=$(pangoxlibs)
 endif
 
 if INCLUDE_DEVANAGARI_X
@@ -39,7 +44,7 @@ devanagari_x_noinst=libpango-devanagari-x.la
 devanagari_x_cflags=-DDEVANAGARI_X_MODULE_PREFIX
 else
 devanagari_x_inst=pango-devanagari-x.la
-devanagari_x_moduleflags=-rpath $(libdir)
+devanagari_x_libadd=$(pangoxlibs)
 endif
 
 if INCLUDE_GUJARATI_X
@@ -47,15 +52,13 @@ gujarati_x_noinst=libpango-gujarati-x.la
 gujarati_x_cflags=-DGUJARATI_X_MODULE_PREFIX
 else
 gujarati_x_inst=pango-gujarati-x.la
-gujarati_x_moduleflags=-rpath $(libdir)
+gujarati_x_libadd=$(pangoxlibs)
 endif
 
-if INCLUDE_ANY_INDIC
 noinst_LTLIBRARIES = $(myanmar_x_noinst) $(gurmukhi_x_noinst) $(bengali_x_noinst) $(devanagari_x_noinst) $(gujarati_x_noinst)
-else
+
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(devanagari_x_inst) $(gujarati_x_inst)
-endif
 
 endif
 
@@ -64,39 +67,47 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(X_CFLAGS) $(myanmar_x_cflags
 EXTRA_DIST = \
 	pango-indic-script.h
 
-pango_devanagari_x_la_LDFLAGS = $(devanagari_x_moduleflags) -export-dynamic -avoid-version -module
+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_myanmar_x_la_LDFLAGS = $(myanmar_x_moduleflags) -export-dynamic -avoid-version -module
+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_gurmukhi_x_la_LDFLAGS = $(gurmukhi_x_moduleflags) -export-dynamic -avoid-version -module
+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_bengali_x_la_LDFLAGS = $(bengali_x_moduleflags) -export-dynamic -avoid-version -module
+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_gujarati_x_la_LDFLAGS = $(gujarati_x_moduleflags) -export-dynamic -avoid-version -module
+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
 else
 pango_gujarati_x_la_SOURCES = gujarati-x.c
 endif
 
+included-modules: $(noinst_LTLIBRARIES)
+
+.PHONY: included-modules
 
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index a0bf102f..f0fb4e61 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -1,13 +1,20 @@
 ## Process this file with automake to create Makefile.in.
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_XFT
-XFT_MODULES=pango-tamil-xft.la
 if INCLUDE_TAMIL_XFT
+XFT_MODULES=
 XFT_INCLUDED=libpango-tamil-xft.la
 XFT_PREFIX=-DXFT_MODULE_PREFIX
 else
+XFT_MODULES=pango-tamil-xft.la
 XFT_INCLUDED=
 XFT_PREFIX=
+tamil_xft_libadd=$(pangoxftlibs)
 endif
 else
 XFT_MODULES=
@@ -32,6 +39,7 @@ else
 X_MODULES=pango-tamil-x.la
 X_INCLUDED=
 X_PREFIX=
+tamil_x_libadd=$(pangoxlibs)
 endif
 else
 X_MODULES=
@@ -43,17 +51,21 @@ noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
 moduledir = $(libdir)/pango/modules
-moduleflags=-rpath $(libdir)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
-pango_tamil_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_tamil_x_la_LIBADD = $(tamil_x_libadd)
 pango_tamil_x_la_SOURCES = $(x_sources)
 
 libpango_tamil_x_la_SOURCES = $(x_sources)
 
-pango_tamil_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_tamil_xft_la_LIBADD = 
+pango_tamil_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_tamil_xft_la_LIBADD = $(tamil_xft_libadd)
 pango_tamil_xft_la_SOURCES = $(xft_sources)
 
 libpango_tamil_xft_la_SOURCES = $(xft_sources)
+
+included-modules: $(noinst_LTLIBRARIES)
+
+.PHONY: included-modules
diff --git a/modules/tamil/tamil-xft.c b/modules/tamil/tamil-xft.c
index 647132c9..e1d32926 100644
--- a/modules/tamil/tamil-xft.c
+++ b/modules/tamil/tamil-xft.c
@@ -403,7 +403,7 @@ tamil_engine_xft_new ()
  * Pango
  */
 #ifdef XFT_MODULE_PREFIX
-#define MODULE_ENTRY(func) _pango_basic_xft_##func
+#define MODULE_ENTRY(func) _pango_tamil_xft_##func
 #else
 #define MODULE_ENTRY(func) func
 #endif
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 3b22ed78..fc4e4a98 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -2,6 +2,11 @@
 
 sources = thai-x.c
 
+pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+
 if HAVE_X
 if INCLUDE_THAI_X
 noinst_LTLIBRARIES = libpango-thai-x.la
@@ -9,15 +14,18 @@ moddefine = -DX_MODULE_PREFIX
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-thai-x.la
-moduleflags=-rpath $(libdir)
+thai_x_libadd=$(pangoxlibs)
 endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_thai_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
-pango_thai_x_la_LIBADD =
+pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_thai_x_la_LIBADD = $(thai_x_libadd)
 pango_thai_x_la_SOURCES = $(sources)
 
 libpango_thai_x_la_SOURCES = $(sources)
 
+included-modules: $(noinst_LTLIBRARIES)
+
+.PHONY: included-modules