Bug 328067 – Install pango-view

2006-02-06  Behdad Esfahbod  <behdad@gnome.org>

        Bug 328067 – Install pango-view

        Added a rather generic framework for a pango-view example.  All
        backends have their own pango*-view built, and a pango-view binary
        is built too, that can choose backend via --backend.  This one is
        installed in bindir.

        * examples/Makefile.am: Updated, to build pangox-view, pangoft2-view,
        pangoxft-view, pangocairo-view, and pango-view.

        * examples/viewer.h, examples/viewer-x.c, examples/viewer-x.h
        examples/viewer-cairo.c, examples/viewer-cairo.h,
        examples/viewer-main.c, examples/viewer-pangox.c,
        examples/viewer-pangoft2.c, examples/viewer-pangoxft.c,
        examples/viewer-pangocairo.c, examples/pango-view.c,
        examples/pango-xview.c, examples/pango-ft2view.c,
        examples/pango-xftview.c, examples/pango-cairoview.c: Added.

        * examples/cairoview.c, examples/xftview.c, examples/pangoft2topgm.c,
        examples/viewer-qt.cc, examples/viewer-qt.h: Removed.

        * configure.in: Check for Cairo Xlib backend, also AC_DEFINE various
        backend bits.

1 files changed, 122 insertions, 36 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0d2dc42d..63a41531 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to create Makefile.in.
 
 TEST_TEXTS =			\
-	test-arabic.txt	\
+	test-arabic.txt		\
 	test-devanagari.txt	\
 	test-ipa.txt		\
-	test-syriac.txt	\
+	test-syriac.txt		\
 	test-tamil.txt		\
 	test-tibetan.txt	\
 	HELLO.utf8		\
@@ -18,7 +18,6 @@ EXTRA_DIST =			\
 CLEANFILES = pangorc
 
 INCLUDES =				\
-	-DPANGO_DISABLE_DEPRECATED	\
 	-I$(top_srcdir)			\
 	$(PANGO_DEBUG_FLAGS)		\
 	$(GLIB_CFLAGS)			\
@@ -28,34 +27,64 @@ INCLUDES =				\
 	$(X_CFLAGS)
 
 noinst_PROGRAMS =
+bin_PROGRAMS =
 
-###################################################
+#########################################################
 if HAVE_FREETYPE
 noinst_PROGRAMS += pangoft2-view
-endif
 
-pangoft2_view_SOURCES =			\
-	pangoft2topgm.c				\
-	renderdemo.h				\
-	renderdemo.c
+pangoft2_view_SOURCES =					\
+	renderdemo.h					\
+	renderdemo.c					\
+	viewer.h					\
+	viewer-main.c					\
+	viewer-pangoft2.c				\
+	pangoft2-view.c
+
 pangoft2_view_LDADD =					\
 	../pango/libpango-$(PANGO_API_VERSION).la	\
 	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
 	$(GLIB_LIBS)					\
 	$(FREETYPE_LIBS)
-###################################################
+endif
+#########################################################
+
+#########################################################
+if HAVE_X
+noinst_PROGRAMS += pangox-view
+
+pangox_view_SOURCES =					\
+	renderdemo.h					\
+	renderdemo.c					\
+	viewer.h					\
+	viewer-x.h					\
+	viewer-x.c					\
+	viewer-main.c					\
+	viewer-pangox.c					\
+	pangox-view.c
 
-###################################################
+pangox_view_LDADD =					\
+	../pango/libpango-$(PANGO_API_VERSION).la	\
+	../pango/libpangox-$(PANGO_API_VERSION).la	\
+	$(GLIB_LIBS)					\
+	$(X_LIBS)
+endif
+#########################################################
+
+#########################################################
 if HAVE_XFT
 noinst_PROGRAMS += pangoxft-view
-endif
 
-pangoxft_view_SOURCES =				\
-	renderdemo.h				\
-	renderdemo.c				\
-	viewer-x.h				\
-	viewer-x.c				\
-	xftview.c
+pangoxft_view_SOURCES =					\
+	renderdemo.h					\
+	renderdemo.c					\
+	viewer.h					\
+	viewer-x.h					\
+	viewer-x.c					\
+	viewer-main.c					\
+	viewer-pangoxft.c				\
+	pangoxft-view.c
+
 pangoxft_view_LDADD =					\
 	../pango/libpango-$(PANGO_API_VERSION).la	\
 	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
@@ -63,36 +92,92 @@ pangoxft_view_LDADD =					\
 	$(GLIB_LIBS)					\
 	$(XFT_LIBS)					\
 	$(X_LIBS)
-###################################################
+endif
+#########################################################
 
-###################################################
+#########################################################
 if HAVE_CAIRO
 if HAVE_X
-if HAVE_FREETYPE
+if HAVE_CAIRO_XLIB
 noinst_PROGRAMS += pangocairo-view
+
+pangocairo_view_SOURCES =				\
+	renderdemo.h					\
+	renderdemo.c					\
+	viewer.h					\
+	viewer-cairo.h					\
+	viewer-cairo.c					\
+	viewer-x.h					\
+	viewer-x.c					\
+	viewer-main.c					\
+	viewer-pangocairo.c				\
+	pangocairo-view.c
+
+pangocairo_view_LDADD =					\
+	../pango/libpango-$(PANGO_API_VERSION).la	\
+	../pango/libpangocairo-$(PANGO_API_VERSION).la	\
+	$(GLIB_LIBS)					\
+	$(CAIRO_LIBS)					\
+	$(X_LIBS)
 endif
 endif
 endif
+#########################################################
 
-pangocairo_view_SOURCES =			\
-	renderdemo.h				\
-	renderdemo.c				\
-	viewer-x.h				\
-	viewer-x.c				\
-	cairoview.c
-pangocairo_view_LDADD =					\
+#########################################################
+if HAVE_X
+bin_PROGRAMS += pango-view
+pango_view_SOURCES =					\
+	renderdemo.h					\
+	renderdemo.c					\
+	viewer.h					\
+	viewer-x.h					\
+	viewer-x.c					\
+	viewer-main.c					\
+	pango-view.c
+pango_view_LDADD =					\
 	../pango/libpango-$(PANGO_API_VERSION).la	\
+	$(GLIB_LIBS)
+if HAVE_X
+pango_view_SOURCES +=					\
+	viewer-pangox.c
+pango_view_LDADD +=					\
+	../pango/libpangox-$(PANGO_API_VERSION).la
+endif
+if HAVE_FREETYPE
+pango_view_SOURCES +=					\
+	viewer-pangoft2.c
+pango_view_LDADD +=					\
 	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
+	$(FREETYPE_LIBS)
+endif
+if HAVE_XFT
+pango_view_SOURCES +=					\
+	viewer-pangoxft.c
+pango_view_LDADD +=					\
+	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
+	../pango/libpangoxft-$(PANGO_API_VERSION).la	\
+	$(XFT_LIBS)
+endif
+if HAVE_CAIRO
+if HAVE_CAIRO_XLIB
+pango_view_SOURCES +=					\
+	viewer-cairo.h					\
+	viewer-cairo.c					\
+	viewer-pangocairo.c
+pango_view_LDADD +=					\
 	../pango/libpangocairo-$(PANGO_API_VERSION).la	\
-	$(GLIB_LIBS)					\
-	$(CAIRO_LIBS)					\
+	$(CAIRO_LIBS)
+endif
+endif
+pango_view_LDADD +=					\
 	$(X_LIBS)
-###################################################
+endif
+#########################################################
 
-###################################################
+#########################################################
 if HAVE_CAIRO_PNG
 noinst_PROGRAMS += cairosimple
-endif
 
 cairosimple_SOURCES =					\
 	cairosimple.c
@@ -101,9 +186,10 @@ cairosimple_LDADD =					\
 	../pango/libpangocairo-$(PANGO_API_VERSION).la	\
 	$(GLIB_LIBS)					\
 	$(CAIRO_LIBS)
-###################################################
+endif
+#########################################################
+
+BUILT_SOURCES = pangorc
 
 pangorc: $(srcdir)/../modules/pangorc
 	cp $< $@
-
-$(noinst_PROGRAMS): pangorc