diff -Naur poppler-0.15.0/glib/demo/Makefile.am poppler-0.15.0-magellan/glib/demo/Makefile.am
--- poppler-0.15.0/glib/demo/Makefile.am	2010-07-24 01:18:27.000000000 +0200
+++ poppler-0.15.0-magellan/glib/demo/Makefile.am	2010-09-29 11:54:11.000000000 +0200
@@ -51,5 +51,5 @@
 
 LDADD =						\
 	$(top_builddir)/glib/libpoppler-glib.la	\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(GTK_TEST_LIBS)
diff -Naur poppler-0.15.0/glib/Makefile.am poppler-0.15.0-magellan/glib/Makefile.am
--- poppler-0.15.0/glib/Makefile.am	2010-09-16 21:05:23.000000000 +0200
+++ poppler-0.15.0-magellan/glib/Makefile.am	2010-09-29 12:09:12.000000000 +0200
@@ -69,7 +69,7 @@
 	poppler-private.h
 
 libpoppler_glib_la_LIBADD =				\
-	$(top_builddir)/poppler/libpoppler.la		\
+	-lpoppler					\
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(POPPLER_GLIB_LIBS)				\
 	$(GDK_LIBS)					\
@@ -85,7 +85,7 @@
        test-poppler-glib.cc
 
 test_poppler_glib_LDADD =			\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	libpoppler-glib.la			\
 	$(POPPLER_GLIB_LIBS)			\
 	$(GDK_LIBS)				\
diff -Naur poppler-0.15.0/glib/reference/Makefile.am poppler-0.15.0-magellan/glib/reference/Makefile.am
--- poppler-0.15.0/glib/reference/Makefile.am	2010-07-24 01:18:27.000000000 +0200
+++ poppler-0.15.0-magellan/glib/reference/Makefile.am	2010-09-29 11:57:44.000000000 +0200
@@ -73,7 +73,7 @@
 	$(GDK_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.15.0/Makefile.am poppler-0.15.0-magellan/Makefile.am
--- poppler-0.15.0/Makefile.am	2010-07-24 01:18:27.000000000 +0200
+++ poppler-0.15.0-magellan/Makefile.am	2010-09-29 11:59:46.000000000 +0200
@@ -34,7 +34,7 @@
 utils_subdir = utils
 endif
 
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
 
 EXTRA_DIST =					\
 	README-XPDF				\
@@ -53,13 +53,10 @@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =				\
-	poppler.pc				\
 	$(cairo_pc_file)			\
-	$(splash_pc_file)			\
 	$(glib_pc_file)				\
 	$(qt_pc_file)                           \
-	$(qt4_pc_file)				\
-	$(cpp_pc_file)
+	$(qt4_pc_file)
 
 # Add CMake buildsystem files here so they get added on make dist
 EXTRA_DIST +=							\
diff -Naur poppler-0.15.0/qt/Makefile.am poppler-0.15.0-magellan/qt/Makefile.am
--- poppler-0.15.0/qt/Makefile.am	2010-07-24 01:18:28.000000000 +0200
+++ poppler-0.15.0-magellan/qt/Makefile.am	2010-09-29 12:00:40.000000000 +0200
@@ -25,7 +25,7 @@
 	poppler-private.h
 
 libpoppler_qt_la_LIBADD = 			\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(POPPLER_QT_LIBS)			\
 	$(FREETYPE_LIBS)			\
 	$(FONTCONFIG_LIBS)
@@ -42,7 +42,7 @@
        test-poppler-qt.cpp
 
 test_poppler_qt_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	libpoppler-qt.la			\
 	$(libqt3_LIBS)				\
 	$(FREETYPE_LIBS)
diff -Naur poppler-0.15.0/qt4/demos/Makefile.am poppler-0.15.0-magellan/qt4/demos/Makefile.am
--- poppler-0.15.0/qt4/demos/Makefile.am	2010-07-24 01:18:28.000000000 +0200
+++ poppler-0.15.0-magellan/qt4/demos/Makefile.am	2010-09-29 12:01:35.000000000 +0200
@@ -9,7 +9,7 @@
 	$(POPPLER_QT4_CFLAGS)
 
 LDADDS =					\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
 	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
diff -Naur poppler-0.15.0/qt4/src/Makefile.am poppler-0.15.0-magellan/qt4/src/Makefile.am
--- poppler-0.15.0/qt4/src/Makefile.am	2010-09-16 21:05:23.000000000 +0200
+++ poppler-0.15.0-magellan/qt4/src/Makefile.am	2010-09-29 12:04:39.000000000 +0200
@@ -55,7 +55,7 @@
 	-Dpoppler_qt4_EXPORTS
 
 libpoppler_qt4_la_LIBADD = 			\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(top_builddir)/poppler/libpoppler-arthur.la	\
 	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
diff -Naur poppler-0.15.0/qt4/tests/Makefile.am poppler-0.15.0-magellan/qt4/tests/Makefile.am
--- poppler-0.15.0/qt4/tests/Makefile.am	2010-09-01 21:02:04.000000000 +0200
+++ poppler-0.15.0-magellan/qt4/tests/Makefile.am	2010-09-29 12:05:10.000000000 +0200
@@ -9,7 +9,7 @@
 	$(POPPLER_QT4_CFLAGS)
 
 LDADDS =					\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
 	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
diff -Naur poppler-0.15.0/test/Makefile.am poppler-0.15.0-magellan/test/Makefile.am
--- poppler-0.15.0/test/Makefile.am	2010-07-24 01:18:28.000000000 +0200
+++ poppler-0.15.0-magellan/test/Makefile.am	2010-09-29 12:06:36.000000000 +0200
@@ -53,14 +53,14 @@
        gtk-splash-test.cc
 
 gtk_splash_test_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(GTK_TEST_LIBS)
 
 gtk_cairo_test_SOURCES =			\
        gtk-cairo-test.cc
 
 gtk_cairo_test_LDADD =					\
-	$(top_builddir)/poppler/libpoppler.la		\
+	-lpoppler					\
 	$(top_builddir)/glib/libpoppler-glib.la		\
 	$(CAIRO_LIBS)					\
 	$(GTK_TEST_LIBS)				\
@@ -71,7 +71,7 @@
 
 pdf_inspector_LDADD =					\
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
-	$(top_builddir)/poppler/libpoppler.la		\
+	-lpoppler					\
 	$(CAIRO_LIBS)					\
 	$(FREETYPE_LIBS)				\
 	$(GTK_TEST_LIBS)				\
@@ -82,7 +82,7 @@
        perf-test-preview-dummy.cc
 
 perf_test_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(FREETYPE_LIBS)					\
 	$(X_EXTRA_LIBS)
 
@@ -90,7 +90,7 @@
 	pdf-fullrewrite.cc
 
 pdf_fullrewrite_LDADD = \
-	$(top_builddir)/poppler/libpoppler.la
+	-lpoppler
 
 EXTRA_DIST =					\
 	pdf-operators.c				\
diff -Naur poppler-0.15.0/utils/Makefile.am poppler-0.15.0-magellan/utils/Makefile.am
--- poppler-0.15.0/utils/Makefile.am	2010-08-31 22:43:18.000000000 +0200
+++ poppler-0.15.0-magellan/utils/Makefile.am	2010-09-29 12:07:18.000000000 +0200
@@ -20,7 +20,7 @@
 	$(ABIWORD_CFLAGS)
 
 LDADD =						\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler				\
 	$(UTILS_LIBS)				\
 	$(FONTCONFIG_LIBS)