From patchwork Thu May 12 14:06:06 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ludwig Nussel <ludwig.nussel@suse.de>
X-Patchwork-Id: 11873
Received: from mx2.suse.de ([195.135.220.15])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1DWEKF-0000zn-LZ
	for vdr@linuxtv.org; Thu, 12 May 2005 16:06:07 +0200
Received: from hermes.suse.de (hermes-ext.suse.de [195.135.221.8])
	(using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits))
	(No client certificate requested)
	by mx2.suse.de (Postfix) with ESMTP id D97A8A250
	for <vdr@linuxtv.org>; Thu, 12 May 2005 16:06:06 +0200 (CEST)
Date: Thu, 12 May 2005 16:06:06 +0200
From: Ludwig Nussel <ludwig.nussel@suse.de>
To: vdr@linuxtv.org
Message-ID: <20050512140606.GA22316@suse.de>
Mail-Followup-To: vdr@linuxtv.org
Mime-Version: 1.0
Content-Disposition: inline
X-Operating-System: SuSE Linux 9.3 (i586)
X-Accept-Language: de en
X-PGP-Fingerprint: 2987 6870 60BA 3158 F587  88C5 2394 431A FF81 35CE
User-Agent: Mutt/1.5.9i
Subject: [vdr] [PATCH] make Makefile of 1.3.24 patch friendlier
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2005 14:06:07 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 2137

Hi,

Following patch makes it easier for other patches to modify the list
of linked libs without conflicting with each other. Also allow to
change INCLUDES in Make.config and add -fPIC as that is needed for
architectures != i386.

cu
Ludwig

Index: vdr-1.3.24/Makefile
===================================================================
--- vdr-1.3.24.orig/Makefile
+++ vdr-1.3.24/Makefile
@@ -12,12 +12,14 @@ CC       ?= gcc
 CFLAGS   ?= -O2
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 DVBDIR   = ../DVB
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
+LIBS     = -ljpeg -lpthread -ldl
+INCLUDES =
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
@@ -29,7 +31,7 @@ DOXYFILE = Doxyfile
 
 -include Make.config
 
-INCLUDES = -I$(DVBDIR)/include
+INCLUDES += -I$(DVBDIR)/include
 
 SILIB    = $(LSIDIR)/libsi.a
 
@@ -106,7 +108,7 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(SILIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
 
 # The font files:
 
Index: vdr-1.3.24/Make.config.template
===================================================================
--- vdr-1.3.24.orig/Make.config.template
+++ vdr-1.3.24/Make.config.template
@@ -14,7 +14,7 @@ CC       = gcc
 CFLAGS   = -O2
 
 CXX      = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment: