diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-19 12:10:28 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-19 12:10:28 +0100 |
| commit | 4132f5e7459b10df0faa9c36b632451e7f7d9afc (patch) | |
| tree | 88a4d8bdacf5f19118dd769585f40efec4ea687e /Make.config.template | |
| parent | 8e54caa2057fb8d2c65da1273aa805ef4c80b5af (diff) | |
| download | vdr-4132f5e7459b10df0faa9c36b632451e7f7d9afc.tar.gz vdr-4132f5e7459b10df0faa9c36b632451e7f7d9afc.tar.bz2 | |
Removed some redundancy in the Makefile/Make.global/Make.config mechanism
Diffstat (limited to 'Make.config.template')
| -rw-r--r-- | Make.config.template | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Make.config.template b/Make.config.template index 08f9ece8..3a4e3842 100644 --- a/Make.config.template +++ b/Make.config.template @@ -6,20 +6,16 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Make.config.template 2.10 2012/10/09 10:32:32 kls Exp $ +# $Id: Make.config.template 2.11 2012/12/18 17:37:54 kls Exp $ ### The C compiler and options: CC = gcc CFLAGS = -g -O3 -Wall +CFLAGS += -fPIC CXX = g++ -CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses - -ifdef PLUGIN -CFLAGS += -fPIC -CXXFLAGS += -fPIC -endif +CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine: ifdef M32 @@ -35,9 +31,10 @@ MANDIR = $(PREFIX)/man BINDIR = $(PREFIX)/bin # By default locale and plugin files are built under the source directory: -LOCDIR = ./locale -PLUGINDIR = ./PLUGINS -PLUGINLIBDIR = $(PLUGINDIR)/lib +INCDIR = $(CWD)/include +LOCDIR = $(CWD)/locale +PLUGINDIR = $(CWD)/PLUGINS +LIBDIR = $(PLUGINDIR)/lib # By default VDR requires only one single directory to operate: VIDEODIR = /video # Activate the following line to build VDR according to the FHS ("File system Hierarchy Standard"): @@ -47,8 +44,9 @@ VIDEODIR = /srv/vdr/video CONFDIR = /var/lib/vdr CACHEDIR = /var/cache/vdr RESDIR = $(PREFIX)/share/vdr +INCDIR = $(PREFIX)/include LOCDIR = $(PREFIX)/share/locale -PLUGINLIBDIR = $(PREFIX)/lib/vdr +LIBDIR = $(PREFIX)/lib/vdr endif ### The remote control: |