[poppler] poppler/qt4/src: Makefile.am,1.3,1.4

[Kristian Høgsberg]

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

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/qt4/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	30 Dec 2005 22:31:32 -0000	1.3
+++ Makefile.am	6 Jan 2006 10:05:59 -0000	1.4
@@ -7,18 +7,20 @@
 poppler_includedir = $(includedir)/poppler
 
 poppler_include_HEADERS =			\
-	poppler-qt4.h ../../poppler/PageTransition.h
+	poppler-qt4.h				\
+	../../qt/poppler-page-transition.h
 
-lib_LTLIBRARIES=libpoppler-qt4.la
+lib_LTLIBRARIES = libpoppler-qt4.la
 
 libpoppler_qt4_la_SOURCES =			\
 	poppler-document.cc			\
 	poppler-page.cc				\
 	poppler-fontinfo.cc			\
 	poppler-textbox.cc			\
+	../../qt/poppler-page-transition.cc	\
 	poppler-private.h
 
-libpoppler_qt4_la_LIBADD= 			\
+libpoppler_qt4_la_LIBADD = 			\
 	$(top_builddir)/poppler/libpoppler.la	\
 	$(POPPLER_QT4_LIBS)