From: rpolzer <rpolzer@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Wed, 17 Sep 2008 07:34:12 +0000 (+0000)
Subject: more depcheck fixes
X-Git-Tag: svn-r421~342
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=911a5e0fdd654717669bfad300be8ed97a2f5222;p=xonotic%2Fnetradiant.git

more depcheck fixes


git-svn-id: svn://svn.icculus.org/netradiant/trunk@78 61c419a2-8eb2-4b30-bcec-8cead039b335
---

diff --git a/Makefile b/Makefile
index def04346..a9f34f0b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ BUILD              ?= debug
 # or: release
 OS                 ?= $(shell uname)
 # or: Linux, Win32, Darwin
+LDFLAGS            ?=
 CFLAGS             ?=
 CXXFLAGS           ?=
 CPPFLAGS           ?=
@@ -187,7 +188,7 @@ dependencies-check:
 		$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
 		if \
 			$(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o $(TO_DEVNULL) && \
-			$(CXX) conftest.o $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
+			$(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
 		then \
 			$(RM) conftest conftest.o conftest.d; \
 			$(ECHO) "found."; \