diff options
author | horchi <vdr@jwendel.de> | 2020-01-28 14:17:15 +0100 |
---|---|---|
committer | horchi <vdr@jwendel.de> | 2020-01-28 14:17:15 +0100 |
commit | c4a31df50ec668b873c453d34e2e8c6352292748 (patch) | |
tree | ee934005a49b24b0ce911df0e30e966af208ddca | |
parent | 71cd4593136eeaf7612f6ca44e61172221d77b77 (diff) | |
download | vdr-epg-daemon-c4a31df50ec668b873c453d34e2e8c6352292748.tar.gz vdr-epg-daemon-c4a31df50ec668b873c453d34e2e8c6352292748.tar.bz2 |
2020-01-28: version 1.1.150 (horchi)\n - added: Using pkg-config for libxml2 (by Alexander Grothe)\n\n1.1.150
-rw-r--r-- | HISTORY.h | 7 | ||||
-rw-r--r-- | Make.config | 2 | ||||
-rw-r--r-- | Makefile | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -4,8 +4,8 @@ * ----------------------------------- */ -#define _VERSION "1.1.149" -#define VERSION_DATE "15.12.2019" +#define _VERSION "1.1.150" +#define VERSION_DATE "28.01.2020 #define DB_API 7 #ifdef GIT_REV @@ -17,6 +17,9 @@ /* * ------------------------------------ * + * +2020-01-28: version 1.1.150 (horchi) + - added: Using pkg-config for libxml2 (by Alexander Grothe) 2019-12-15: version 1.1.149 (horchi) - added: Added cleanup for old wasted timers diff --git a/Make.config b/Make.config index db65ba0..b2e1794 100644 --- a/Make.config +++ b/Make.config @@ -73,7 +73,7 @@ ifdef SYSD_NOTIFY endif ifdef USELIBXML - DEFINES += $(shell xml2-config --cflags) $(shell xslt-config --cflags) + DEFINES += $(shell pkg-config libxml-2.0 --cflags) $(shell pkg-config libxslt --cflags) endif ifdef USEPYTHON @@ -16,8 +16,8 @@ BASELIBS += $(shell pkg-config --cflags --libs jansson) HLIB = -L./lib -lhorchi -DLIBS = $(HLIB) $(BASELIBS) -lcurl $(shell xml2-config --libs) $(shell xslt-config --libs) -lexslt -HTTPLIBS = $(HLIB) -lmicrohttpd $(BASELIBS) -lcurl $(shell xml2-config --libs) $(shell xslt-config --libs) -lexslt -ljpeg $(shell imlib2-config --libs) +DLIBS = $(HLIB) $(BASELIBS) -lcurl $(shell pkg-config libxml-2.0 --libs) $(shell pkg-config libxslt --libs) -lexslt +HTTPLIBS = $(HLIB) -lmicrohttpd $(BASELIBS) -lcurl $(shell pkg-config libxml-2.0 --libs) $(shell pkg-config libxslt --libs) -lexslt -ljpeg $(shell pkg-config imlib2 --libs) CFLAGS += $(shell mysql_config --include) VERSION = $(shell grep 'define _VERSION ' $(HISTFILE) | awk '{ print $$3 }' | sed -e 's/[";]//g') |