frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoiding unnecessary pkg-config warnings in plugin Makefiles

Browse Source
This commit is contained in:
Klaus Schmidinger
2014-01-01 13:35:13 +01:00
parent 16dd077fb2
commit ea613e6b26
33 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PLUGINS/src/pictures/HISTORY
View File

@@ -91,3 +91,7 @@ VDR Plugin 'pictures' Revision History
2013-07-01:
- Added option -x to pic2mpg.
2014-01-01: Version 2.1.1
- Avoiding unnecessary pkg-config warnings in plugin Makefiles.

4
PLUGINS/src/pictures/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The directory environment:
# 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))
PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
PLGCFG = $(call PKGCFG,plgcfg)

4
PLUGINS/src/pictures/pictures.c
View File

@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $
* $Id: pictures.c 3.1 2014/01/01 13:29:54 kls Exp $
*/
#include <getopt.h>
@@ -11,7 +11,7 @@
#include "menu.h"
#include "player.h"
static const char *VERSION = "2.0.0";
static const char *VERSION = "2.1.1";
static const char *DESCRIPTION = trNOOP("A simple picture viewer");
static const char *MAINMENUENTRY = trNOOP("Pictures");