diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-25 04:05:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-25 04:05:27 +0000 |
| commit | 0590ccf215b0df243825a1b5fd395926c781f66c (patch) | |
| tree | ea6b2144782aa20d9552d5e815e6167354665837 /examples/Makefile.am | |
| parent | 8e6f34e2b82737b61645d43476602fc6ec59630e (diff) | |
| download | pango-0590ccf215b0df243825a1b5fd395926c781f66c.tar.gz | |
Remove this file; pangofttopgm is the test case for the FT2 backend now.
Wed Jan 23 16:49:24 2002 Owen Taylor <otaylor@redhat.com>
* examples/viewer-ft2.c: Remove this file; pangofttopgm
is the test case for the FT2 backend now.
* examples/Makefile.am: Don't dist moc_viewer-qt.cc.
* examples/Makefile.am: Build pangofttopgm if we have FT2.
* examples/pangoft2topgm.c (main): Warning fixes.
Diffstat (limited to 'examples/Makefile.am')
| -rw-r--r-- | examples/Makefile.am | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 9989bb4d..04f9fe91 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,32 +2,44 @@ aliasdir = $(sysconfdir)/pango -################################################### -if BUILD_QT_TEST +INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FREETYPE_CFLAGS) +################################################### QT_INCLUDES=-I $(QTDIR)/include QT_LIBS=-L$(QTDIR)/lib -lqt MOC=$(QTDIR)/bin/moc -INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) +if BUILD_QT_TEST -bin_PROGRAMS = pango-viewer +viewer_programs = pango-viewer -pango_viewer_SOURCES = \ - viewer-qt.cc \ - viewer-qt.h \ - moc_viewer-qt.cc +BUILT_SOURCES=moc_viewer-qt.cc moc_viewer-qt.cc: viewer-qt.h $(MOC) $< -o $@ -BUILT_SOURCES=moc_viewer-qt.cc +endif + +pango_viewer_SOURCES = \ + viewer-qt.cc \ + viewer-qt.h -pango_viewer_LDADD = ../pango/libpangox.la ../pango/libpango.la $(FRIBIDI_LIBS) $(QT_LIBS) +CLEANFILES = moc_viewer-qt.cc +pango_viewer_LDADD = ../pango/libpangox.la ../pango/libpango.la $(FRIBIDI_LIBS) $(QT_LIBS) moc_viewer-qt.$(OBJEXT) +################################################### +################################################### +if HAVE_FREETYPE +ft2_programs = pangoft2topgm endif + +pangoft2topgm_SOURCES = pangoft2topgm.c +pangoft2topgm_LDADD = ../pango/libpango.la ../pango/libpangoft2.la $(FREETYPE_LIBS) ################################################### +bin_PROGRAMS = $(viewer_programs) +noinst_PROGRAMS = $(ft2_programs) + all-local: pango.modules pango.modules: @@ -45,7 +57,6 @@ EXTRA_DIST= \ viewer-qt.cc \ viewer-qt.h \ viewer-win32.c \ - viewer-ft2.c \ pangoft2topgm.c \ makefile.mingw \ makefile.mingw.in \ |