diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-03-15 13:13:03 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-03-15 13:13:03 -0400 |
| commit | a08cd2843ea38b142d375a15a08520c8758cd4ba (patch) | |
| tree | b10a1e4f1278205a25a39f0c7fcb2c58a23d0719 | |
| parent | 9644e56231280151803e0bdbee7141507a6b899f (diff) | |
| download | pango-a08cd2843ea38b142d375a15a08520c8758cd4ba.tar.gz | |
[Makefile.am] Cleanup
| -rw-r--r-- | pango-view/Makefile.am | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pango-view/Makefile.am b/pango-view/Makefile.am index a27398fc..08bd4744 100644 --- a/pango-view/Makefile.am +++ b/pango-view/Makefile.am @@ -36,17 +36,12 @@ INCLUDES = \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) -bin_PROGRAMS = - ######################################################### -if HAVE_X -bin_PROGRAMS += pango-view +bin_PROGRAMS = pango-view pango_view_SOURCES = \ viewer-render.h \ viewer-render.c \ viewer.h \ - viewer-x.h \ - viewer-x.c \ viewer-main.c \ pango-view.c pango_view_LDADD = \ @@ -54,9 +49,12 @@ pango_view_LDADD = \ $(GLIB_LIBS) if HAVE_X pango_view_SOURCES += \ + viewer-x.h \ + viewer-x.c \ viewer-pangox.c pango_view_LDADD += \ - ../pango/libpangox-$(PANGO_API_VERSION).la + ../pango/libpangox-$(PANGO_API_VERSION).la \ + $(X_LIBS) endif if HAVE_FREETYPE pango_view_SOURCES += \ @@ -74,20 +72,14 @@ pango_view_LDADD += \ $(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/libpangoft2-$(PANGO_API_VERSION).la \ ../pango/libpangocairo-$(PANGO_API_VERSION).la \ $(CAIRO_LIBS) endif -endif -pango_view_LDADD += \ - $(X_LIBS) -endif ######################################################### BUILT_SOURCES = pangorc |