frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Using relative paths again when building plugins locally

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-12-27 16:15:38 +01:00
parent 2e138748c2
commit f70414cf5b
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1763,6 +1763,7 @@ Udo Richter <udo_richter@gmx.de>
for suggesting to check cIoThrottle::Engaged() in cRemoveDeletedRecordingsThread::Action() for suggesting to check cIoThrottle::Engaged() in cRemoveDeletedRecordingsThread::Action()
for suggesting to shift editing marks that don't point to an I-frame towards the next I-frame for suggesting to shift editing marks that don't point to an I-frame towards the next I-frame
when a recording is played when a recording is played
for requesting to keep using relative paths when building plugins locally
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

1
HISTORY
View File

@ -7476,3 +7476,4 @@ Video Disk Recorder Revision History
- Now using targets "install-lib" and "install-i18n" when building plugins locally. - Now using targets "install-lib" and "install-i18n" when building plugins locally.
- Added MANDIR to the vdr.pc file, so that plugins that need it can retrieve it via - Added MANDIR to the vdr.pc file, so that plugins that need it can retrieve it via
MANDIR = $(DESTDIR)$(call PKGCFG,mandir). MANDIR = $(DESTDIR)$(call PKGCFG,mandir).
- Using relative paths again when building plugins locally (by request of Udo Richter).

20
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Makefile 2.41 2012/12/27 14:00:51 kls Exp $ # $Id: Makefile 2.42 2012/12/27 16:02:53 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -23,7 +23,7 @@ CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
# Directories: # Directories:
CWD := $(shell pwd) CWD = .
LSIDIR = ./libsi LSIDIR = ./libsi
DESTDIR ?= DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
@ -52,6 +52,8 @@ ifdef DVBDIR
CFLAGS += -I$(DVBDIR)/include CFLAGS += -I$(DVBDIR)/include
endif endif
UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,)
SILIB = $(LSIDIR)/libsi.a SILIB = $(LSIDIR)/libsi.a
OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
@ -135,11 +137,11 @@ vdr.pc:
@echo "videodir=$(VIDEODIR)" >> $@ @echo "videodir=$(VIDEODIR)" >> $@
@echo "cachedir=$(CACHEDIRDEF)" >> $@ @echo "cachedir=$(CACHEDIRDEF)" >> $@
@echo "resdir=$(RESDIRDEF)" >> $@ @echo "resdir=$(RESDIRDEF)" >> $@
@echo "libdir=$(LIBDIR)" >> $@ @echo "libdir=$(UP3)$(LIBDIR)" >> $@
@echo "locdir=$(LOCDIR)" >> $@ @echo "locdir=$(UP3)$(LOCDIR)" >> $@
@echo "apiversion=$(APIVERSION)" >> $@ @echo "apiversion=$(APIVERSION)" >> $@
@echo "cflags=$(CFLAGS) $(CDEFINES) -I$(INCDIR)" >> $@ @echo "cflags=$(CFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@
@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(INCDIR)" >> $@ @echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@
@echo "" >> $@ @echo "" >> $@
@echo "Name: VDR" >> $@ @echo "Name: VDR" >> $@
@echo "Description: Video Disk Recorder" >> $@ @echo "Description: Video Disk Recorder" >> $@
@ -202,9 +204,9 @@ plugins: include-dir vdr.pc
fi;\ fi;\
includes=;\ includes=;\
if [ "$(INCDIR)" != "$(CWD)/include" ]; then\ if [ "$(INCDIR)" != "$(CWD)/include" ]; then\
includes="INCLUDES=-I$(CWD)/include";\ includes="INCLUDES=-I$(UP3)/include";\
fi;\ fi;\
$(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) $$includes $$target || failed="$$failed $$i";\ $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3)$(CWD) $$includes $$target || failed="$$failed $$i";\
done;\ done;\
if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\ if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
@ -247,7 +249,7 @@ install-doc:
install-plugins: plugins install-plugins: plugins
@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ @for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
$(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\ $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3)$(CWD) DESTDIR=$(DESTDIR) install;\
done done
# Includes: # Includes: