From c9064411f72a68afcb4cd093a7724ec91719144d Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sun, 4 Mar 2012 15:31:15 +0100 Subject: [PATCH] build only static djvulibre and fix cross-compile #26 --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 8faea98d0..078011392 100644 --- a/Makefile +++ b/Makefile @@ -141,16 +141,11 @@ $(MUPDFLIBS) $(THIRDPARTYLIBS): $(MUPDFDIR)/cmapdump.host $(MUPDFDIR)/fontdump.h $(DJVULIBS): -mkdir $(DJVUDIR)/build ifdef EMULATE_READER - cd $(DJVUDIR)/build && ../configure --enable-desktopfiles=no + cd $(DJVUDIR)/build && ../configure --disable-desktopfiles --disable-shared --enable-static else - cd $(DJVUDIR)/build && ../configure --enable-desktopfiles=no --host=arm -endif - make -C $(DJVUDIR)/build CXX="$(CXX)" -ifdef EMULATE_READER - cd $(DJVUDIR)/build/libdjvu/.libs && ar -cvq libdjvulibre.a *.o -else - cd $(DJVUDIR)/build/libdjvu/ && ar -cvq libdjvulibre.a *.o + cd $(DJVUDIR)/build && ../configure --disable-desktopfiles --disable-shared --enable-static --host=arm-kindle-linux-gnueabi endif + make -C $(DJVUDIR)/build $(LUALIB): make -C lua/src CC="$(CC)" CFLAGS="$(CFLAGS)" MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E" liblua.a