diff -Naur poppler-0.6.4/glib/demo/Makefile.am poppler-0.6.4-magellan/glib/demo/Makefile.am
--- poppler-0.6.4/glib/demo/Makefile.am	2008-01-21 21:00:59.000000000 +0100
+++ poppler-0.6.4-magellan/glib/demo/Makefile.am	2008-02-15 15:38:32.000000000 +0100
@@ -26,5 +26,5 @@
 
 LDADD =						\
 	$(top_builddir)/glib/libpoppler-glib.la	\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(GTK_TEST_LIBS)
diff -Naur poppler-0.6.4/glib/Makefile.am poppler-0.6.4-magellan/glib/Makefile.am
--- poppler-0.6.4/glib/Makefile.am	2008-01-21 20:59:14.000000000 +0100
+++ poppler-0.6.4-magellan/glib/Makefile.am	2008-02-15 15:33:57.000000000 +0100
@@ -4,7 +4,7 @@
 	$(CAIRO_CFLAGS)
 
 cairo_libs =					\
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
+	-lpoppler				\
 	$(CAIRO_LIBS)
 
 endif
@@ -84,7 +84,7 @@
 	poppler-private.h
 
 libpoppler_glib_la_LIBADD =				\
-	$(top_builddir)/poppler/libpoppler.la		\
+	-lpoppler					\
 	$(POPPLER_GLIB_LIBS)				\
 	$(FREETYPE_LIBS)				\
 	$(FONTCONFIG_LIBS)				\
@@ -98,7 +98,7 @@
        test-poppler-glib.cc
 
 test_poppler_glib_LDADD =			\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	libpoppler-glib.la			\
 	$(POPPLER_GLIB_LIBS)			\
 	$(FREETYPE_LIBS)			\
diff -Naur poppler-0.6.4/glib/reference/Makefile.am poppler-0.6.4-magellan/glib/reference/Makefile.am
--- poppler-0.6.4/glib/reference/Makefile.am	2008-01-21 20:59:14.000000000 +0100
+++ poppler-0.6.4-magellan/glib/reference/Makefile.am	2008-02-15 15:39:10.000000000 +0100
@@ -72,7 +72,7 @@
 	$(POPPLER_GLIB_CFLAGS)				\
 	$(FREETYPE_CFLAGS)
 
-GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
+GTKDOC_LIBS=-lpoppler					\
 	$(top_builddir)/glib/libpoppler-glib.la		\
 	$(POPPLER_GLIB_LIBS)				\
 	$(FREETYPE_LIBS)				\
diff -Naur poppler-0.6.4/Makefile.am poppler-0.6.4-magellan/Makefile.am
--- poppler-0.6.4/Makefile.am	2008-01-21 20:59:14.000000000 +0100
+++ poppler-0.6.4-magellan/Makefile.am	2008-02-15 15:15:08.000000000 +0100
@@ -29,7 +29,7 @@
 utils_subdir = utils
 endif
 
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
 
 EXTRA_DIST =					\
 	README-XPDF				\
@@ -40,9 +40,7 @@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =				\
-	poppler.pc				\
 	$(cairo_pc_file)			\
-	$(splash_pc_file)			\
 	$(glib_pc_file)				\
 	$(qt_pc_file)                           \
 	$(qt4_pc_file)
diff -Naur poppler-0.6.4/qt/Makefile.am poppler-0.6.4-magellan/qt/Makefile.am
--- poppler-0.6.4/qt/Makefile.am	2008-01-21 20:59:14.000000000 +0100
+++ poppler-0.6.4-magellan/qt/Makefile.am	2008-02-15 15:16:08.000000000 +0100
@@ -24,7 +24,7 @@
 	poppler-private.h
 
 libpoppler_qt_la_LIBADD = 			\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(POPPLER_QT_LIBS)			\
 	$(FREETYPE_LIBS)			\
 	$(FONTCONFIG_LIBS)
@@ -41,7 +41,7 @@
        test-poppler-qt.cpp
 
 test_poppler_qt_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	libpoppler-qt.la			\
 	$(POPPLER_QT_LIBS)			\
 	$(FREETYPE_LIBS)
diff -Naur poppler-0.6.4/qt4/src/Makefile.am poppler-0.6.4-magellan/qt4/src/Makefile.am
--- poppler-0.6.4/qt4/src/Makefile.am	2008-01-21 20:59:14.000000000 +0100
+++ poppler-0.6.4-magellan/qt4/src/Makefile.am	2008-02-15 15:17:20.000000000 +0100
@@ -36,7 +36,7 @@
 	poppler-private.h
 
 libpoppler_qt4_la_LIBADD = 			\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
 
diff -Naur poppler-0.6.4/qt4/tests/Makefile.am poppler-0.6.4-magellan/qt4/tests/Makefile.am
--- poppler-0.6.4/qt4/tests/Makefile.am	2008-01-21 21:00:59.000000000 +0100
+++ poppler-0.6.4-magellan/qt4/tests/Makefile.am	2008-02-15 15:17:42.000000000 +0100
@@ -7,7 +7,7 @@
 	$(POPPLER_QT4_CFLAGS)
 
 LDADDS =					\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
 	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)