From: leslie <unknown>
Date: Sun, 2 Aug 2009 05:23:34 +0000 (+0800)
Subject: testing: fix order of Make.config inclusion in Makefile
X-Git-Tag: upstream/620~232
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=89f8695fcd5ee1ca92b5f279de49171e725bf57f;p=sasc-ng.git

testing: fix order of Make.config inclusion in Makefile
---

diff --git a/testing/Makefile b/testing/Makefile
index 72f02b9..7aa7489 100644
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -3,10 +3,6 @@
 
 VDRDIR = ../../../..
 
-### Allow user defined options to overwrite defaults:
-
--include $(VDRDIR)/Make.config
-
 ### The C++ compiler and options:
 
 CXX      ?= g++
@@ -14,11 +10,20 @@ CXXFLAGS ?= -g -march=pentium3 -O2 -Wall -Woverloaded-virtual
 
 ### Includes and Defines
 
+INCLUDES = -I.. -I$(VDRDIR)/include
+DEFINES  = -DAPIVERSNUM=$(APIVERSNUM) -DAPIVERSION='"$(APIVERSION)"' -D_GNU_SOURCE
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+-include ../Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
 APIVERSION = $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
 APIVERSNUM = $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
 
-INCLUDES = -I.. -I$(VDRDIR)/include
-DEFINES  = -DAPIVERSNUM=$(APIVERSNUM) -DAPIVERSION='"$(APIVERSION)"' -D_GNU_SOURCE
+### The object files (add further files here):
 
 OBJS = misc.o log.o override.o data.o crypto.o parse.o system.o system-common.o smartcard.o network.o filter.o version.o
 SHAREDOBJS = compat.o $(VDRDIR)/tools.o $(VDRDIR)/thread.o