From 9c100c8d0aa440112aa7a7454dda1dd814daf317 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 9 Feb 2015 12:30:42 +0100 Subject: [PATCH] Added an empty target to the Makefile to make sure the sub-make for libsi is always called --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ Makefile | 7 ++++--- libsi/Makefile | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 94fce49d..c0d916f3 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3182,6 +3182,8 @@ S ci.c to no longer compile with older versions of gcc for suggesting to make the "Select folder" menu add the folder names of all existing recordings to any names that have been predefined in "folders.conf" + for adding an empty target to the Makefile to make sure the sub-make for libsi is + always called Peter Münster for fixing 'make install' to not overwrite existing configuration files diff --git a/HISTORY b/HISTORY index 4a8986ab..67bcca88 100644 --- a/HISTORY +++ b/HISTORY @@ -8533,3 +8533,5 @@ Video Disk Recorder Revision History - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Increased the width of the left text column in the Setup menus to avoid cutting off German texts. +- Added an empty target to the Makefile to make sure the sub-make for libsi is always + called (thanks to Sören Moch). diff --git a/Makefile b/Makefile index a69fb4eb..97220364 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 3.5 2015/02/02 14:47:24 kls Exp $ +# $Id: Makefile 3.6 2015/02/09 12:28:24 kls Exp $ .DELETE_ON_ERROR: @@ -139,8 +139,9 @@ vdr: $(OBJS) $(SILIB) # The libsi library: -$(SILIB): - $(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all +$(SILIB): make-libsi + @$(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all +make-libsi: # empty rule makes sure the sub-make for libsi is always called # pkg-config file: diff --git a/libsi/Makefile b/libsi/Makefile index dff5ca9c..dc67e516 100644 --- a/libsi/Makefile +++ b/libsi/Makefile @@ -1,7 +1,7 @@ # # Makefile for a libsi # -# $Id: Makefile 2.4 2012/12/18 13:35:54 kls Exp $ +# $Id: Makefile 3.1 2015/02/09 12:28:24 kls Exp $ ### The archiver options: @@ -32,6 +32,7 @@ $(DEPFILE): Makefile ### Targets: all: libsi.a + @: libsi.a : $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)