diff --git a/CONTRIBUTORS b/CONTRIBUTORS index fff0b542..505568fb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1101,6 +1101,7 @@ Rolf Ahrenberg ETSI EN 300 743, chapter 7.2.1 for fixing the array size of Atypes in cPatFilter::Process() for adding support for "registration descriptor" to 'libsi' and using it in pat.c + for adding an include of VDR's 'Make.global' to libsi's Makefile Ralf Klueber for reporting a bug in cutting a recording if there is only a single editing mark diff --git a/HISTORY b/HISTORY index 7b07ac15..bf05f252 100644 --- a/HISTORY +++ b/HISTORY @@ -6503,3 +6503,5 @@ Video Disk Recorder Revision History - Added support for "registration descriptor" to 'libsi' and using it in pat.c (thanks to Rolf Ahrenberg). - Fixed unjustified log entries about changed channel pids (reported by Derek Kelly). +- Added an include of VDR's 'Make.global' to libsi's Makefile (thanks to Rolf + Ahrenberg). diff --git a/libsi/Makefile b/libsi/Makefile index cfc889b8..37be2f60 100644 --- a/libsi/Makefile +++ b/libsi/Makefile @@ -1,7 +1,7 @@ # # Makefile for a libsi # -# $Id: Makefile 1.6 2006/05/26 10:40:19 kls Exp $ +# $Id: Makefile 2.1 2010/11/07 13:31:05 kls Exp $ ### The C++ compiler and options: @@ -11,6 +11,7 @@ AR = ar ARFLAGS = ru RANLIB = ranlib +include ../Make.global -include ../Make.config ### The directory environment: