From 8b728035f9cfe490ba109494eb8564d11552e374 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@gnome.org>
Date: Mon, 23 Jan 2006 16:27:21 +0000
Subject: Make tests/examples do use generated pango.modules. (bug #328291)

2006-01-23  Behdad Esfahbod  <behdad@gnome.org>

        Make tests/examples do use generated pango.modules. (bug #328291)

        * examples/pangorc, tests/pangorc: Removed. Moved to modules/.

        * examples/pangox.aliases: Removed. Moved to pango/.

        * examples/Makefile.am, tests/Makefile.am: Remove pango.modules
        creation stuff, copy pangorc from $(srcdir)/../modules/pangorc
        insteadd.

        * examples/renderdemo.c: Add --pangorc option, default to ./pangorc.
        Setenv PANGO_RC_FILE to whatever pangorc file decided.

        * tests/*.c: Setenv PANGO_RC_FILE to ./pangorc.

        * pango/pangox.aliases: Added.

        * pango/Makefile.am: Install pangox.aliases.

        * modules/pangorc: Added.

        * modules/Makefile.am: Create pango.modules.  Added pangorc.

        * modules/.cvsignore, examples/.cvsignore, tests/.cvsignore: Updated.
---
 modules/Makefile.am | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'modules/Makefile.am')

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 73b2cf43..89b9ccf4 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,16 +12,21 @@ SUBDIRS = 		\
 	tibetan
 
 EXTRA_DIST =		\
-	module.def
+	module.def	\
+	pangorc
+
+CLEANFILES =		\
+	pango.modules
 
 if CROSS_COMPILING
-RUN_QUERY_IMMODULES_TEST=false
+RUN_QUERY_MODULES_TEST=false
 else
-RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)"
+RUN_QUERY_MODULES_TEST=test -z "$(DESTDIR)"
+all-local: pango.modules
 endif
 
-install-data-local:
-	@if $(RUN_QUERY_IMMODULES_TEST) ; then 				\
+install-data-local: $(top_builddir)/pango/pango-querymodules
+	@if $(RUN_QUERY_MODULES_TEST) ; then 				\
 	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
 	  $(top_builddir)/pango/pango-querymodules 			\
 		\> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;	\
@@ -30,13 +35,22 @@ install-data-local:
 		> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;		\
 	else								\
 	  echo "***" ; 							\
-	  echo "*** Warning: pango.modules not created" ; 		\
-	  echo "***" ; 							\
+	  echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; 	\
+	  echo "*** not created" ; 					\
 	  echo "*** Generate this file on the target system" ; 		\
-	  echo "*** system using pango-querymodules" ; 			\
+	  echo "*** using pango-querymodules" ; 			\
 	  echo "***" ; 							\
 	fi
 
+pango.modules: $(top_builddir)/pango/pango-querymodules $(SUBDIRS)
+	@if find . -name '*.so' | grep 'so' > /dev/null ; then \
+          echo "Writing a pango.modules file to use with tests/examples."; \
+          $(top_builddir)/pango/pango-querymodules `find . -name '*.la' | grep -v '\.libs' | grep -v libpango` > $@ ;\
+	else \
+          echo "No dynamic modules found; will use only static modules for tests/examples."; \
+	  touch $@; \
+	fi
+
 included-modules:
 	@for d in $(SUBDIRS) ; do \
 		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
@@ -48,4 +62,3 @@ dynamic-modules:
         done
 
 .PHONY: included-modules dynamic-modules
-
-- 
cgit v1.2.1