[poppler] poppler/utils: Makefile.am,1.3,1.4

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/utils
In directory gabe:/tmp/cvs-serv554/utils

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

        * qt/poppler-page.cc:
        * qt/poppler-private.h:
        * qt/poppler-qt.h:
        * qt4/src/Makefile.am:
        * qt/Makefile.am:
        * poppler/Makefile.am: Move PageTransition to qt bindings, move
        contents from Private.h to qt/poppler-private.h.

        * poppler/TextOutputDev.cc (visitWord): Remove #warning.

        * utils/Makefile.am (pdfimages_SOURCES): Add ImageOutputDev.h, use
        dist_man1_MANS so we actually dist the man pages.

        * goo/Makefile.am (poppler_goo_include_HEADERS): Add GooVector.h.

        * glib/reference/Makefile.am: DOC_SOURCE_DIR must be relative to
        $(srcdir), fix this to make distchek run.

        * m4/qt.m4:
        * m4/libjpeg.m4:
        * acinclude.m4:
        * configure.ac: Split out Qt and libjpeg checks from configure.ac
        and acinclude.m4 to m4/qt.m4 and m4/libjpeg.m4.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/utils/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	21 Dec 2005 17:30:34 -0000	1.3
+++ Makefile.am	6 Jan 2006 10:05:59 -0000	1.4
@@ -7,16 +7,52 @@
 LDADD =						\
 	$(top_builddir)/poppler/libpoppler.la
 
-bin_PROGRAMS = pdffonts pdfimages pdfinfo pdftops pdftotext pdftohtml
+bin_PROGRAMS =					\
+	pdffonts				\
+	pdfimages				\
+	pdfinfo					\
+	pdftops					\
+	pdftotext				\
+	pdftohtml
 
-man1_MANS = pdffonts.1 pdfimages.1 pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1
+dist_man1_MANS =				\
+	pdffonts.1				\
+	pdfimages.1				\
+	pdfinfo.1				\
+	pdftops.1				\
+	pdftotext.1				\
+	pdftohtml.1
 
 common = parseargs.c parseargs.h
 
-pdffonts_SOURCES	= pdffonts.cc $(common)
-pdfimages_SOURCES	= pdfimages.cc ImageOutputDev.cc $(common)
-pdfinfo_SOURCES		= pdfinfo.cc $(common)
-pdftops_SOURCES		= pdftops.cc $(common)
-pdftotext_SOURCES	= pdftotext.cc $(common)
-pdftohtml_SOURCES	= pdftohtml.cc $(common)	\
-	HtmlFonts.cc HtmlLinks.cc HtmlOutputDev.cc
+pdffonts_SOURCES =				\
+	pdffonts.cc				\
+	$(common)
+
+pdfimages_SOURCES =				\
+	pdfimages.cc				\
+	ImageOutputDev.cc			\
+	ImageOutputDev.h			\
+	$(common)
+
+pdfinfo_SOURCES =				\
+	pdfinfo.cc				\
+	$(common)
+
+pdftops_SOURCES =				\
+	pdftops.cc				\
+	$(common)
+
+pdftotext_SOURCES =				\
+	pdftotext.cc				\
+	$(common)
+
+pdftohtml_SOURCES =				\
+	pdftohtml.cc				\
+	HtmlFonts.cc				\
+	HtmlFonts.h				\
+	HtmlLinks.cc				\
+	HtmlLinks.h				\
+	HtmlOutputDev.cc			\
+	HtmlOutputDev.h				\
+	$(common)