[poppler] poppler/glib: Makefile.am,1.12,1.13

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/glib
In directory kemper:/tmp/cvs-serv26076/glib

Modified Files:
	Makefile.am 
Log Message:
2006-02-28  Kristian Høgsberg  <krh at redhat.com>

        * 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.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/glib/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	16 Feb 2006 19:28:54 -0000	1.12
+++ Makefile.am	28 Feb 2006 23:24:59 -0000	1.13
@@ -8,7 +8,7 @@
 
 endif
 
-SUBDIRS=. reference
+SUBDIRS = . reference
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/poppler			\
@@ -77,10 +77,11 @@
 	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