frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made the Makefile patch friendlier

This commit is contained in:
Klaus Schmidinger 2005-05-14 10:33:37 +02:00
parent faf7d4b743
commit e096b86ef6
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -788,6 +788,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
for adding some checks when canceling a thread and removing the usleep() in for adding some checks when canceling a thread and removing the usleep() in
cThread::Start() cThread::Start()
for removing the LOCK_THREAD from the LIRC thread for removing the LOCK_THREAD from the LIRC thread
for making the Makefile patch friendlier
Thomas Koch <tom@harhar.net> Thomas Koch <tom@harhar.net>
for his support in keeping the Premiere World channels up to date in 'channels.conf' for his support in keeping the Premiere World channels up to date in 'channels.conf'

1
HISTORY
View File

@ -3522,3 +3522,4 @@ Video Disk Recorder Revision History
- Added a check for Setup.DiSEqC in cDvbDevice::ProvidesTransponder(), otherwise - Added a check for Setup.DiSEqC in cDvbDevice::ProvidesTransponder(), otherwise
the EPG scan didn't work on systems that don't use DiSEqC (thanks to Michael the EPG scan didn't work on systems that don't use DiSEqC (thanks to Michael
Reinelt for reporting this one). Reinelt for reporting this one).
- Made the Makefile patch friendlier (thanks to Ludwig Nussel).

4
Make.config.template
View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Make.config.template 1.3 2003/08/09 11:03:25 kls Exp $ # $Id: Make.config.template 1.4 2005/05/14 10:32:33 kls Exp $
### The C compiler and options: ### The C compiler and options:
@ -14,7 +14,7 @@ CC = gcc
CFLAGS = -O2 CFLAGS = -O2
CXX = g++ CXX = g++
CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:

10
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Makefile 1.74 2005/02/13 10:13:45 kls Exp $ # $Id: Makefile 1.75 2005/05/14 10:32:13 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -12,12 +12,14 @@ CC ?= gcc
CFLAGS ?= -O2 CFLAGS ?= -O2
CXX ?= g++ CXX ?= g++
CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
DVBDIR = ../DVB DVBDIR = ../DVB
LSIDIR = ./libsi LSIDIR = ./libsi
MANDIR = /usr/local/man MANDIR = /usr/local/man
BINDIR = /usr/local/bin BINDIR = /usr/local/bin
LIBS = -ljpeg -lpthread -ldl
INCLUDES =
PLUGINDIR= ./PLUGINS PLUGINDIR= ./PLUGINS
PLUGINLIBDIR= $(PLUGINDIR)/lib PLUGINLIBDIR= $(PLUGINDIR)/lib
@ -29,7 +31,7 @@ DOXYFILE = Doxyfile
-include Make.config -include Make.config
INCLUDES = -I$(DVBDIR)/include INCLUDES += -I$(DVBDIR)/include
SILIB = $(LSIDIR)/libsi.a SILIB = $(LSIDIR)/libsi.a
@ -106,7 +108,7 @@ $(DEPFILE): Makefile
# The main program: # The main program:
vdr: $(OBJS) $(SILIB) 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: # The font files: