diff options
| author | louis <louis.braun@gmx.de> | 2015-04-04 14:31:18 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2015-04-04 14:31:18 +0200 |
| commit | e9f8d708cf3d9f765b2d4210b78f245aede19b53 (patch) | |
| tree | d214363529b9481a49dd3cb261517abc70f157d5 /Makefile | |
| parent | dc6425241494e6e51e7ee2002aa201b0cbeb515d (diff) | |
| download | vdr-plugin-skindesigner-e9f8d708cf3d9f765b2d4210b78f245aede19b53.tar.gz vdr-plugin-skindesigner-e9f8d708cf3d9f765b2d4210b78f245aede19b53.tar.bz2 | |
adapted Makefiles to work also in a LCLBLD environment
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 19 insertions, 4 deletions
@@ -15,7 +15,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 --silence-errors --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --silence-errors --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) @@ -54,9 +54,24 @@ LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) -ljpeg LIBS += $(shell xml2-config --libs) -INCLUDES += $(shell pkg-config --cflags libskindesignerapi) -LIBS += $(shell pkg-config --libs libskindesignerapi) -DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(shell pkg-config --modversion libskindesignerapi)"' +INCLUDESLIBSD = $(shell pkg-config --silence-errors --cflags libskindesignerapi) +ifeq ($(strip $(INCLUDESLIBSD)),) + INCLUDESLIBSD = $(shell pkg-config --cflags ./libskindesignerapi/libskindesignerapi.pc) +endif + +LIBSLIBSD = $(shell pkg-config --silence-errors --libs libskindesignerapi) +ifeq ($(strip $(LIBSLIBSD)),) + LIBSLIBSD = $(shell pkg-config --libs ./libskindesignerapi/libskindesignerapi.pc) +endif + +LIBSDVERSION = $(shell pkg-config --silence-errors --modversion libskindesignerapi) +ifeq ($(strip $(LIBSDVERSION)),) + LIBSDVERSION = $(shell pkg-config --modversion ./libskindesignerapi/libskindesignerapi.pc) +endif + +INCLUDES += $(INCLUDESLIBSD) +LIBS += $(LIBSLIBSD) +DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(LIBSDVERSION)"' ### The object files: OBJS = $(PLUGIN).o \ |