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

reverted Makefile changes in parts

Browse Source
This commit is contained in:
louis 2015-04-04 17:42:23 +02:00
parent e9f8d708cf
commit acebd3c275
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -274,3 +274,5 @@ Version 0.4.0
- fixed bug in metrixhd timers menu - fixed bug in metrixhd timers menu
- fixed bug that datetime was not correctly drawn if a submenu implements - fixed bug that datetime was not correctly drawn if a submenu implements
its own datetime display its own datetime display
- adapted Makefiles to work also in a LCLBLD environment
- reverted Makefile changes in parts

21
Makefile
View File

@ -54,24 +54,9 @@ LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) -ljpeg
LIBS += $(shell xml2-config --libs) LIBS += $(shell xml2-config --libs)
INCLUDESLIBSD = $(shell pkg-config --silence-errors --cflags libskindesignerapi) INCLUDES += $(shell pkg-config --cflags libskindesignerapi)
ifeq ($(strip $(INCLUDESLIBSD)),) LIBS += $(shell pkg-config --libs libskindesignerapi)
INCLUDESLIBSD = $(shell pkg-config --cflags ./libskindesignerapi/libskindesignerapi.pc) DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(shell pkg-config --modversion libskindesignerapi)"'
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 \

2
libskindesignerapi/Makefile
View File

@ -12,7 +12,7 @@ TARGET_LIB = $(SONAME).$(MINOR)
PREFIX ?= /usr/local PREFIX ?= /usr/local
INCDIR ?= $(PREFIX)/include INCDIR ?= $(PREFIX)/include
LIBDIR ?= $(PREFIX)/lib LIBDIR ?= $(PREFIX)/lib
PCDIR ?= $(PREFIX)/lib/pkgconfig PCDIR ?= $(shell pkg-config --variable pc_path pkg-config |cut -d ':' -f1)
TMPDIR ?= /tmp TMPDIR ?= /tmp
### The name of the distribution archive: ### The name of the distribution archive: