From c97b4b45e272b45be9c8670623c3075a069aa328 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Thu, 16 May 2013 20:00:23 +0200
Subject: Only link with X11 for X11 viewer.

---
 Makefile  | 5 +++--
 Makethird | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bb525f54..8dfe4d96 100644
--- a/Makefile
+++ b/Makefile
@@ -176,15 +176,16 @@ MUTOOL := $(addprefix $(OUT)/, mutool)
 $(MUTOOL) : $(addprefix $(OUT)/, pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) $(FITZ_LIB) $(THIRD_LIBS)
 
 ifeq "$(NOX11)" ""
+
 MUVIEW := $(OUT)/mupdf
 $(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
 $(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-	$(LINK_CMD) $(X11_LIBS)
+	$(LINK_CMD) $(SYS_X11_LIBS)
 
 MUVIEW_V8 := $(OUT)/mupdf-v8
 $(MUVIEW_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS)
 $(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-	$(LINK_V8_CMD) $(X11_LIBS)
+	$(LINK_V8_CMD) $(SYS_X11_LIBS)
 endif
 
 MUJSTEST_V8 := $(OUT)/mujstest-v8
diff --git a/Makethird b/Makethird
index 832b0645..42264faf 100644
--- a/Makethird
+++ b/Makethird
@@ -253,5 +253,7 @@ ifeq "$(NOX11)" ""
 SYS_X11_CFLAGS := $(SYS_X11_CFLAGS)
 SYS_X11_LIBS := $(SYS_X11_LIBS)
 CFLAGS += $(SYS_X11_CFLAGS)
-LIBS += $(SYS_X11_LIBS)
+else
+SYS_X11_CFLAGS :=
+SYS_X11_LIBS :=
 endif
-- 
cgit v1.2.3