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.

1 files changed, 24 insertions, 13 deletions

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