[poppler] poppler/utils: Makefile.am,1.7,1.8

[Kristian Høgsberg]

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

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/utils/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	23 Feb 2006 22:26:05 -0000	1.7
+++ Makefile.am	28 Feb 2006 23:24:59 -0000	1.8
@@ -1,3 +1,15 @@
+if BUILD_SPLASH_OUTPUT
+
+pdftoppm_SOURCES =				\
+	pdftoppm.cc				\
+	$(common)
+
+pdftoppm_binary = pdftoppm
+
+pdftoppm_manpage = pdftoppm.1
+
+endif
+
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/utils			\
@@ -5,7 +17,8 @@
 	$(UTILS_CFLAGS)
 
 LDADD =						\
-	$(top_builddir)/poppler/libpoppler.la
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(UTILS_LIBS)
 
 bin_PROGRAMS =					\
 	pdffonts				\
@@ -26,7 +39,6 @@
 	pdftotext.1				\
 	pdftohtml.1				\
 	$(pdftoppm_manpage)
-	
 
 common = parseargs.c parseargs.h
 
@@ -62,14 +74,7 @@
 	HtmlOutputDev.h				\
 	$(common)
 
-if BUILD_SPLASH_OUTPUT
-
-pdftoppm_SOURCES =				\
-	pdftoppm.cc				\
-	$(common)
-
-pdftoppm_binary = pdftoppm
-
-pdftoppm_manpage =pdftoppm.1
+# Yay, automake!  It should be able to figure out that it has to dist
+# this file, but nooo.  So we just add it here.
 
-endif
\ No newline at end of file
+EXTRA_DIST = pdftoppm.1