summaryrefslogtreecommitdiff
path: root/glib/Makefile.am
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2006-02-28 23:24:59 +0000
committerKristian Høgsberg <krh@redhat.com>2006-02-28 23:24:59 +0000
commit50ecfadab36a9769b09e4c2c1670d86448a0e1ee (patch)
tree0a28dc89cfc8cd772e9c54036e005cde9bd85a3e /glib/Makefile.am
parentb9e951ac68b9977ab7217ad0346bcf46a3fa3dfe (diff)
2006-02-28 Kristian Høgsberg <krh@redhat.com>poppler-0.5.1
* configure.ac: Bump release to 0.5.1. * NEWS: Sum up 0.5.1 changes so far. * TextOutputDev.h: add getters for a couple of attributes. * glib/Makefile.am: * poppler/Makefile.am: Move cairo link dependency to glib bindings.
Diffstat (limited to 'glib/Makefile.am')
-rw-r--r--glib/Makefile.am11
1 files changed, 6 insertions, 5 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 443d48b4..b4113209 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -8,7 +8,7 @@ cairo_libs = \
endif
-SUBDIRS=. reference
+SUBDIRS = . reference
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
@@ -77,10 +77,11 @@ libpoppler_glib_la_SOURCES = \
poppler.cc \
poppler-private.h
-libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
- $(POPPLER_GLIB_LIBS) \
- $(FREETYPE_LIBS) \
+libpoppler_glib_la_LIBADD = \
+ $(top_builddir)/poppler/libpoppler.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(POPPLER_GLIB_LIBS) \
+ $(FREETYPE_LIBS) \
$(cairo_libs)
libpoppler_glib_la_LDFLAGS = -version-info 1:0:0