From patchwork Sun Mar 17 11:46:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ville_Skytt=C3=A4?= X-Patchwork-Id: 17398 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UHC3G-0000wc-43; Sun, 17 Mar 2013 12:46:58 +0100 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UHC2m-0000th-TH for vdr@linuxtv.org; Sun, 17 Mar 2013 12:46:55 +0100 X-tubIT-Incoming-IP: 209.85.215.50 Received: from mail-la0-f50.google.com ([209.85.215.50]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtps [TLSv1:RC4-SHA:128] for id 1UHC2m-0002GT-En; Sun, 17 Mar 2013 12:46:28 +0100 Received: by mail-la0-f50.google.com with SMTP id ec20so5034421lab.23 for ; Sun, 17 Mar 2013 04:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:message-id:date:from:user-agent:mime-version:to :subject:x-enigmail-version:content-type; bh=t52F4GIiyuP+JyoQaza0DRwU2rCXwq/VHTPLsxxX3Cw=; b=021cOxBgj2Z2QjHSD/82ULM9fBKQZcBtrtK5n5aA5u1pN0ygLjNtXonXbBMOroKr6v 1nCpSKfO7CHmWwrEmUhapLvdAwjMmxhYeN8AiSPC1wWPrAgeCy6hVDsK7ZqXSyD77FNY rjqQitxjVk1xaJuU27oaTp32xzqwySunmtuL/qhvrtpMpOt283s5y2D91ALLNuZDaDQf FJWpKG4CLRNN3v536kTSI1GsKz6RCREYHp7i2bPkvM+xO2nF3ypxYGD9ZeP1Y9Dn4Iku GFZsKM0MPEeMp0pwdJZaXlD00lcPN0rJkuins/k1DaLUM6b2nU1e4KBoLof7RLWXWN/5 NW7g== X-Received: by 10.152.133.67 with SMTP id pa3mr11048169lab.44.1363520787518; Sun, 17 Mar 2013 04:46:27 -0700 (PDT) Received: from viper.bobcat.mine.nu (cs78200229.pp.htv.fi. [62.78.200.229]) by mx.google.com with ESMTPS id e9sm4151003lbz.1.2013.03.17.04.46.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 17 Mar 2013 04:46:26 -0700 (PDT) Message-ID: <5145AD10.1060702@iki.fi> Date: Sun, 17 Mar 2013 13:46:24 +0200 From: =?ISO-8859-1?Q?Ville_Skytt=E4?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 MIME-Version: 1.0 To: 'VDR Mailing List' X-Enigmail-Version: 1.5.1 X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.17.113623 X-PMX-Spam: Gauge=X, Probability=10%, Report=' WEBMAIL_REPLYTO_NOT_FROM 0.5, HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_10000_PLUS 0, DKIM_SIGNATURE 0, NO_URI_FOUND 0, WEBMAIL_SOURCE 0, __BAT_BOUNDARY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_SENDER 0, __HAS_FROM 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __PHISH_SPEAR_STRUCTURE_1 0, __RDNS_GMAIL 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __USER_AGENT 0, __YOUTUBE_RCVD 0' X-LSpam-Score: -1.1 (-) X-LSpam-Report: No, score=-1.1 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, RDNS_NONE=0.793, T_DKIM_INVALID=0.01 autolearn=no Subject: [vdr] Makefile variable names LCLBLD and PLGCFG X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: vdr-bounces@linuxtv.org Errors-To: vdr-bounces@linuxtv.org Hello, Should probably have spoken earlier, but is there any particular reason for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG? I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they have to be short for anything, it's not like we're running out of space for their names anywhere, is it? Besides, I don't think LCLBLD describes what its effects are very well, INPLACE would sounds better to me. The ship may already have sailed for plgcfg in vdr.pc as it's being used by many plugin Makefiles already, but I believe the attached patches should be safe for 2.0.0. From 79a900a9995c1d401543e2804027cc019b5f7375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 17 Mar 2013 13:43:40 +0200 Subject: [PATCH 2/2] Rename PLGCFG to PLUGINCONFIG. --- Make.config.template | 2 +- Makefile | 2 +- PLUGINS/src/dvbhddevice/Makefile | 4 ++-- PLUGINS/src/dvbsddevice/Makefile | 4 ++-- PLUGINS/src/epgtableid0/Makefile | 4 ++-- PLUGINS/src/hello/Makefile | 4 ++-- PLUGINS/src/osddemo/Makefile | 4 ++-- PLUGINS/src/pictures/Makefile | 4 ++-- PLUGINS/src/rcu/Makefile | 4 ++-- PLUGINS/src/servicedemo/Makefile | 4 ++-- PLUGINS/src/skincurses/Makefile | 4 ++-- PLUGINS/src/status/Makefile | 4 ++-- PLUGINS/src/svdrpdemo/Makefile | 4 ++-- newplugin | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Make.config.template b/Make.config.template index 40cfefe..8a04fd7 100644 --- a/Make.config.template +++ b/Make.config.template @@ -62,7 +62,7 @@ endif # Use this if you want to have a central place where you configure compile time # parameters for plugins: -#PLGCFG = $(CONFDIR)/plugins.mk +#PLUGINCONFIG = $(CONFDIR)/plugins.mk ### The remote control: diff --git a/Makefile b/Makefile index 91506e2..a881b03 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ vdr.pc: @echo "resdir=$(RESDIR)" >> $@ @echo "libdir=$(LIBDIR)" >> $@ @echo "locdir=$(LOCDIR)" >> $@ - @echo "plgcfg=$(PLGCFG)" >> $@ + @echo "plgcfg=$(PLUGINCONFIG)" >> $@ @echo "apiversion=$(APIVERSION)" >> $@ @echo "cflags=$(CFLAGS) $(CDEFINES) $(CINCLUDES) $(HDRDIR)" >> $@ @echo "cxxflags=$(CXXFLAGS) $(CDEFINES) $(CINCLUDES) $(HDRDIR)" >> $@ diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile index 0bfd136..c65e3b0 100644 --- a/PLUGINS/src/dvbhddevice/Makefile +++ b/PLUGINS/src/dvbhddevice/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile index f7e73b2..1bde961 100644 --- a/PLUGINS/src/dvbsddevice/Makefile +++ b/PLUGINS/src/dvbsddevice/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile index 6190e62..72ca903 100644 --- a/PLUGINS/src/epgtableid0/Makefile +++ b/PLUGINS/src/epgtableid0/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile index 4bdd5c9..9cec663 100644 --- a/PLUGINS/src/hello/Makefile +++ b/PLUGINS/src/hello/Makefile @@ -19,7 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -34,7 +34,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index 9b7e2c1..9d63bce 100644 --- a/PLUGINS/src/osddemo/Makefile +++ b/PLUGINS/src/osddemo/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile index 3081e27..cb2b7ab 100644 --- a/PLUGINS/src/pictures/Makefile +++ b/PLUGINS/src/pictures/Makefile @@ -19,7 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -34,7 +34,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile index 3dbecdd..61ecdc3 100644 --- a/PLUGINS/src/rcu/Makefile +++ b/PLUGINS/src/rcu/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index e5ba5f5..417b890 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -19,7 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -34,7 +34,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index fa0ce41..0b83009 100644 --- a/PLUGINS/src/skincurses/Makefile +++ b/PLUGINS/src/skincurses/Makefile @@ -19,7 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -34,7 +34,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index 8f6e26f..c84258e 100644 --- a/PLUGINS/src/status/Makefile +++ b/PLUGINS/src/status/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile index 2e39140..532db3f 100644 --- a/PLUGINS/src/svdrpdemo/Makefile +++ b/PLUGINS/src/svdrpdemo/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) -PLGCFG = $(call PKGCFG,plgcfg) +PLUGINCONFIG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -33,7 +33,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include $(PLGCFG) +-include $(PLUGINCONFIG) ### The name of the distribution archive: diff --git a/newplugin b/newplugin index 12eca5a..e035c0e 100755 --- a/newplugin +++ b/newplugin @@ -78,7 +78,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc)) LIBDIR = \$(call PKGCFG,libdir) LOCDIR = \$(call PKGCFG,locdir) -PLGCFG = \$(call PKGCFG,plgcfg) +PLUGINCONFIG = \$(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -93,7 +93,7 @@ APIVERSION = \$(call PKGCFG,apiversion) ### Allow user defined options to overwrite defaults: --include \$(PLGCFG) +-include \$(PLUGINCONFIG) ### The name of the distribution archive: -- 1.7.11.7