diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | Make.config.template | 4 | ||||
| -rw-r--r-- | Makefile | 10 |
4 files changed, 10 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3334d7b6..f286fbe6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -788,6 +788,7 @@ Ludwig Nussel <ludwig.nussel@web.de> for adding some checks when canceling a thread and removing the usleep() in cThread::Start() for removing the LOCK_THREAD from the LIRC thread + for making the Makefile patch friendlier Thomas Koch <tom@harhar.net> for his support in keeping the Premiere World channels up to date in 'channels.conf' @@ -3522,3 +3522,4 @@ Video Disk Recorder Revision History - 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 Reinelt for reporting this one). +- Made the Makefile patch friendlier (thanks to Ludwig Nussel). diff --git a/Make.config.template b/Make.config.template index b39b1f4c..3c429e77 100644 --- a/Make.config.template +++ b/Make.config.template @@ -6,7 +6,7 @@ # See the main source file 'vdr.c' for copyright information and # 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: @@ -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: @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # 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: @@ -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: |