From 6f7eb0e4c943f44d7ec87c050f703a7eeb050d7c Mon Sep 17 00:00:00 2001
From: thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Thu, 8 Oct 2009 19:21:42 +0000
Subject: Don't set SDL variables if we don't build the client -> removes error
 messages when building on a server without SDL installed.

git-svn-id: svn://svn.icculus.org/quake3/trunk@1648 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 Makefile | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index b2ad6cb..f2604d4 100644
--- a/Makefile
+++ b/Makefile
@@ -181,22 +181,25 @@ SDLHDIR=$(MOUNT_DIR)/SDL12
 LIBSDIR=$(MOUNT_DIR)/libs
 TEMPDIR=/tmp
 
-# set PKG_CONFIG_PATH to influence this, e.g.
-# PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
-ifeq ($(shell which pkg-config > /dev/null; echo $$?),0)
-  CURL_CFLAGS=$(shell pkg-config --cflags libcurl)
-  CURL_LIBS=$(shell pkg-config --libs libcurl)
-  OPENAL_CFLAGS=$(shell pkg-config --cflags openal)
-  OPENAL_LIBS=$(shell pkg-config --libs openal)
-  # FIXME: introduce CLIENT_CFLAGS
-  SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
-  SDL_LIBS=$(shell pkg-config --libs sdl)
-endif
-# Use sdl-config if all else fails
-ifeq ($(SDL_CFLAGS),)
-  ifeq ($(shell which sdl-config > /dev/null; echo $$?),0)
-    SDL_CFLAGS=$(shell sdl-config --cflags)
-    SDL_LIBS=$(shell sdl-config --libs)
+# We won't need this if we want to build the client
+ifneq ($(BUILD_CLIENT),0)
+  # set PKG_CONFIG_PATH to influence this, e.g.
+  # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
+  ifeq ($(shell which pkg-config > /dev/null; echo $$?),0)
+    CURL_CFLAGS=$(shell pkg-config --cflags libcurl)
+    CURL_LIBS=$(shell pkg-config --libs libcurl)
+    OPENAL_CFLAGS=$(shell pkg-config --cflags openal)
+    OPENAL_LIBS=$(shell pkg-config --libs openal)
+    # FIXME: introduce CLIENT_CFLAGS
+    SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
+    SDL_LIBS=$(shell pkg-config --libs sdl)
+  endif
+  # Use sdl-config if all else fails
+  ifeq ($(SDL_CFLAGS),)
+    ifeq ($(shell which sdl-config > /dev/null; echo $$?),0)
+      SDL_CFLAGS=$(shell sdl-config --cflags)
+      SDL_LIBS=$(shell sdl-config --libs)
+    endif
   endif
 endif
 
-- 
cgit v1.2.3