frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

adapted Makefiles to work also in a LCLBLD environment

Browse Source
This commit is contained in:
louis 2015-04-04 14:31:18 +02:00
parent dc64252414
commit e9f8d708cf
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -15,7 +15,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The directory environment: ### The directory environment:
# Use package data if installed...otherwise assume we're under the VDR source directory: # 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) LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir) LOCDIR = $(call PKGCFG,locdir)
PLGCFG = $(call PKGCFG,plgcfg) PLGCFG = $(call PKGCFG,plgcfg)
@ -54,9 +54,24 @@ LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) -ljpeg
LIBS += $(shell xml2-config --libs) LIBS += $(shell xml2-config --libs)
INCLUDES += $(shell pkg-config --cflags libskindesignerapi) INCLUDESLIBSD = $(shell pkg-config --silence-errors --cflags libskindesignerapi)
LIBS += $(shell pkg-config --libs libskindesignerapi) ifeq ($(strip $(INCLUDESLIBSD)),)
DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(shell pkg-config --modversion libskindesignerapi)"' 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: ### The object files:
OBJS = $(PLUGIN).o \ OBJS = $(PLUGIN).o \

3
libskindesignerapi/Makefile
View File

@ -18,7 +18,8 @@ TMPDIR ?= /tmp
### The name of the distribution archive: ### The name of the distribution archive:
ARCHIVE = $(LIBNAME)-$(VERSION) ARCHIVE = $(LIBNAME)-$(VERSION)
CXXFLAGS = $(shell pkg-config --variable=cxxflags vdr) 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))
CXXFLAGS = $(call PKGCFG,cxxflags)
LDFLAGS = -shared -Wl,-soname,$(SONAME) LDFLAGS = -shared -Wl,-soname,$(SONAME)
DEFINES += -DAPIVERSION=$(MAJOR) -DLIBVERSION=\"$(VERSION)\" DEFINES += -DAPIVERSION=$(MAJOR) -DLIBVERSION=\"$(VERSION)\"