From b60120161a69e689a39d89c608265faa52785285 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 16 Oct 2004 13:33:45 +0200 Subject: [PATCH] Fixed libsi/Makefile to use the compiler defined in for generating file dependencies --- CONTRIBUTORS | 4 ++-- HISTORY | 4 ++-- libsi/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ad5b9f12..904851d3 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -754,8 +754,8 @@ Christoph Friederich Andreas Brachold for his support in keeping 'channels.conf.terr' up to date - for fixing 'newplugin' to use the compiler defined in $(CXX) for generating file - dependencies + for fixing 'newplugin' and libsi/Makefile to use the compiler defined in $(CXX) + for generating file dependencies Manuel Hartl for suggesting to extend the logging info when starting/stopping timers diff --git a/HISTORY b/HISTORY index 063d5704..36ad5fa9 100644 --- a/HISTORY +++ b/HISTORY @@ -3013,8 +3013,8 @@ Video Disk Recorder Revision History currently in use (it will then return a dummy cOsd object and write a message to the log file). - Added Estonian language texts (thanks to Arthur Konovalov). -- Fixed 'newplugin' to use the compiler defined in $(CXX) for generating file - dependencies (thanks to Andreas Brachold). +- Fixed 'newplugin' and libsi/Makefile to use the compiler defined in $(CXX) for + generating file dependencies (thanks to Andreas Brachold). - Moved the initialization of aPid1 and aPid2 to the beginning of cDvbDevice::cDvbDevice() to have them set in case a patch references them (thanks to Wayne Keer for pointing this out). diff --git a/libsi/Makefile b/libsi/Makefile index 613fbeee..2d8713b3 100644 --- a/libsi/Makefile +++ b/libsi/Makefile @@ -1,7 +1,7 @@ # # Makefile for a libsi # -# $Id: Makefile 1.2 2003/12/13 10:41:39 kls Exp $ +# $Id: Makefile 1.3 2004/10/16 13:31:50 kls Exp $ ### The C++ compiler and options: @@ -30,7 +30,7 @@ OBJS = util.o si.o section.o descriptor.o # Dependencies: -MAKEDEP = g++ -MM -MG +MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@