From b125e2f67eaf4c0d8837fbcd4833359ac00443a2 Mon Sep 17 00:00:00 2001
From: Neil Moore <neil@s-z.org>
Date: Sat, 12 Jul 2014 21:29:54 -0400
Subject: Only use the contrib lib and include directory if building contribs.

At least some linkers complain about nonexistent -L directories.
---
 crawl-ref/source/Makefile | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index cb4d62234c..f2465b214e 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -373,9 +373,6 @@ SAVEDIR := ~/.crawl
 endif
 
 
-INCLUDES_L += -isystem contrib/install/$(ARCH)/include
-LIBS += -Lcontrib/install/$(ARCH)/lib
-
 INCLUDES_L += -Iutil -I.
 
 ifdef APPLE_GCC
@@ -1005,15 +1002,6 @@ ifdef REPORT
 CFOTHERS += -ftime-report
 endif
 
-ifdef ANDROID
-CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
-else
-CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
-endif
-CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L)
-ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
-YACC_CFLAGS  := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
-
 UTIL = util/
 
 EXTRA_OBJECTS += $(YACC_OBJECTS)
@@ -1111,8 +1099,24 @@ endif
 
 EXTRA_OBJECTS += version.o
 
+ifdef CONTRIBS
+INCLUDES_L += -isystem contrib/install/$(ARCH)/include
+LIBS += -Lcontrib/install/$(ARCH)/lib
+endif
+
 LIBS += $(CONTRIB_LIBS) $(EXTRA_LIBS)
 
+
+ifdef ANDROID
+CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
+else
+CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
+endif
+CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L)
+ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
+YACC_CFLAGS  := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
+
+
 DOC_BASE        := ../docs
 DOC_TEMPLATES   := $(DOC_BASE)/template
 GENERATED_DOCS  := $(DOC_BASE)/aptitudes.txt $(DOC_BASE)/FAQ.html $(DOC_BASE)/crawl_manual.txt
-- 
cgit v1.2.3-54-g00ecf