From 1a433954f08b5c478a6a95ed47257121400a7b0d Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 29 Dec 2012 10:31:33 +0100 Subject: Revoked 'Now using targets install-lib and install-i18n when building plugins locally' --- HISTORY | 1 - Makefile | 4 ++-- PLUGINS/src/dvbsddevice/Makefile | 6 +----- PLUGINS/src/epgtableid0/Makefile | 6 +----- PLUGINS/src/osddemo/Makefile | 6 +----- PLUGINS/src/rcu/Makefile | 6 +----- PLUGINS/src/servicedemo/Makefile | 6 +----- PLUGINS/src/status/Makefile | 6 +----- PLUGINS/src/svdrpdemo/Makefile | 6 +----- 9 files changed, 9 insertions(+), 38 deletions(-) diff --git a/HISTORY b/HISTORY index 89c4452e..eff5f89a 100644 --- a/HISTORY +++ b/HISTORY @@ -7473,7 +7473,6 @@ Video Disk Recorder Revision History the CFLAGS. - Removed some redundancy from Make.config.template. - Changed "==" to "=" in the Makefile to make it POSIX style. -- 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 MANDIR = $(DESTDIR)$(call PKGCFG,mandir). - Using relative paths again when building plugins locally (by request of Udo Richter). diff --git a/Makefile b/Makefile index f442fb8b..65dbcf75 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 2.43 2012/12/28 09:44:43 kls Exp $ +# $Id: Makefile 2.44 2012/12/29 10:29:59 kls Exp $ .DELETE_ON_ERROR: @@ -201,7 +201,7 @@ plugins: include-dir vdr.pc fi;\ target=all;\ if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\ - target="install-lib install-i18n";\ + target="install";\ fi;\ includes=;\ if [ "$(INCDIR)" != "$(CWD)/include" ]; then\ diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile index b2c07f24..a18a57cc 100644 --- a/PLUGINS/src/dvbsddevice/Makefile +++ b/PLUGINS/src/dvbsddevice/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.17 2012/12/28 10:09:07 kls Exp $ +# $Id: Makefile 1.18 2012/12/29 10:28:45 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -72,10 +72,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: $(SOFILE): $(OBJS) diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile index 36ae62d7..91aae7f3 100644 --- a/PLUGINS/src/epgtableid0/Makefile +++ b/PLUGINS/src/epgtableid0/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.10 2012/12/28 10:09:16 kls Exp $ +# $Id: Makefile 1.11 2012/12/29 10:28:58 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -72,10 +72,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: $(SOFILE): $(OBJS) diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index e6d8aaae..2d24485e 100644 --- a/PLUGINS/src/osddemo/Makefile +++ b/PLUGINS/src/osddemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.13 2012/12/28 10:09:27 kls Exp $ +# $Id: Makefile 2.14 2012/12/29 10:29:04 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -72,10 +72,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: $(SOFILE): $(OBJS) diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile index be577ccc..db0818cc 100644 --- a/PLUGINS/src/rcu/Makefile +++ b/PLUGINS/src/rcu/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.10 2012/12/28 10:09:31 kls Exp $ +# $Id: Makefile 1.11 2012/12/29 10:29:09 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -72,10 +72,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: $(SOFILE): $(OBJS) diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index 972652f8..df4e372b 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.11 2012/12/28 10:09:34 kls Exp $ +# $Id: Makefile 2.12 2012/12/29 10:29:15 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -69,10 +69,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: libvdr-$(PLUGIN1).so: $(PLUGIN1).o diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index a27bc506..9635a5d0 100644 --- a/PLUGINS/src/status/Makefile +++ b/PLUGINS/src/status/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.12 2012/12/28 10:09:38 kls Exp $ +# $Id: Makefile 2.13 2012/12/29 10:29:20 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -72,10 +72,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: $(SOFILE): $(OBJS) diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile index d0c572e9..d40e483c 100644 --- a/PLUGINS/src/svdrpdemo/Makefile +++ b/PLUGINS/src/svdrpdemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.12 2012/12/28 10:09:41 kls Exp $ +# $Id: Makefile 2.13 2012/12/29 10:29:24 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -72,10 +72,6 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Internationalization (I18N): - -install-i18n: - ### Targets: $(SOFILE): $(OBJS) -- cgit v1.2.3