From b0f7ea5d81d4b88987de45cdb464242b9388b659 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Wed, 3 Oct 2012 14:24:40 +0200
Subject: [PATCH] revert the whole 'let's use ld' thing. It's useless, and
 might wreak havoc on EMU builds picking up system libs instead of the bundled
 ones.

---
 Makefile | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 647573fba..6283b9345 100644
--- a/Makefile
+++ b/Makefile
@@ -112,30 +112,22 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o input.o $(POPENNS
 		blitbuffer.o \
 		drawcontext.o \
 		input.o \
+		$(POPENNSLIB) \
 		util.o \
 		ft.o \
 		lfs.o \
 		mupdfimg.o \
+		$(MUPDFLIBS) \
+		$(THIRDPARTYLIBS) \
+		$(LUALIB) \
 		djvu.o \
+		$(DJVULIBS) \
 		cre.o \
+		$(CRENGINELIBS) \
 		$(STATICLIBSTDCPP) \
 		$(LDFLAGS) \
-		-L$(POPENNSDIR) \
-		-L$(MUPDFLIBDIR) \
-		-L$(DJVUDIR)/build/libdjvu/.libs \
-		-L$(LUADIR)/src \
-		-L$(CRENGINEDIR)/crengine \
-		-L$(CRENGINEDIR)/thirdparty/chmlib \
-		-L$(CRENGINEDIR)/thirdparty/libpng \
-		-L$(CRENGINEDIR)/thirdparty/antiword \
-		-L$(MUPDFLIBDIR) \
 		-o $@ \
-		-lm -lpthread \
-		-lpopen_noshell \
-		-lfitz -lfreetype -lopenjpeg -ljbig2dec -ljpeg -lz \
-		-lluajit -ldl \
-		-ldjvulibre \
-		-lcrengine -lchmlib -lpng -lantiword \
+		-lm -ldl -lpthread \
 		$(EMU_LDFLAGS) \
 		$(DYNAMICLIBSTDCPP)