Added an empty target to the Makefile to make sure the sub-make for libsi is always called

This commit is contained in:
Klaus Schmidinger 2015-02-09 12:30:42 +01:00
parent 2eb23cb9f4
commit 9c100c8d0a
4 changed files with 10 additions and 4 deletions

View File

@ -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 <pmlists@free.fr>
for fixing 'make install' to not overwrite existing configuration files

View File

@ -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).

View File

@ -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:

View File

@ -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)