[poppler] poppler/poppler: Makefile.am,1.21,1.22

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv31247/poppler

Modified Files:
	Makefile.am 
Log Message:
* poppler/Makefile.am:
* qt4/src/Makefile.am: Don't link Qt4 in libpoppler when using Qt4 frontend
  Patch by Stefan Schweizer


Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am	28 Feb 2006 23:24:59 -0000	1.21
+++ Makefile.am	8 Apr 2006 10:44:43 -0000	1.22
@@ -17,10 +17,10 @@
 
 if BUILD_POPPLER_QT4
 
-arthur_headers =				\
-	ArthurOutputDev.h
+poppler_arthur = libpoppler-arthur.la
 
-arthur_sources =				\
+libpoppler_arthur_la_SOURCES =			\
+	ArthurOutputDev.h			\
 	ArthurOutputDev.cc
 
 arthur_includes =				\
@@ -79,13 +79,13 @@
 
 lib_LTLIBRARIES = libpoppler.la
 
-noinst_LTLIBRARIES = $(poppler_cairo)
+noinst_LTLIBRARIES = $(poppler_cairo)		\
+	$(poppler_arthur)
 
 libpoppler_la_LIBADD =				\
 	$(top_builddir)/goo/libgoo.la		\
 	$(top_builddir)/fofi/libfofi.la		\
 	$(splash_libs)				\
-	$(arthur_libs)				\
 	$(libjpeg_libs)				\
 	$(zlib_libs)				\
 	$(FREETYPE_LIBS)
@@ -97,7 +97,6 @@
 poppler_includedir = $(includedir)/poppler
 poppler_include_HEADERS =	\
 	$(splash_headers)	\
-	$(arthur_headers)	\
 	Annot.h			\
 	Array.h			\
 	BaseFile.h		\