diff options
| author | horchi <vdr@jwendel.de> | 2017-03-20 18:02:17 +0100 |
|---|---|---|
| committer | horchi <vdr@jwendel.de> | 2017-03-20 18:02:17 +0100 |
| commit | 42b9898a8a4a07a3134dadce5d24618a0c402fd1 (patch) | |
| tree | 6b3837b836873c8bda454778975fe2461bc006fe /Make.config | |
| parent | 9065c5cfb63a92a08c44fe249b53b6a8cb003eab (diff) | |
| download | vdr-epg-daemon-42b9898a8a4a07a3134dadce5d24618a0c402fd1.tar.gz vdr-epg-daemon-42b9898a8a4a07a3134dadce5d24618a0c402fd1.tar.bz2 | |
2017-03-20: version 1.1.113 (horchi)\n -added: Add validity check of the API key for https://www.themoviedb.org (by 3po)\n - change: Removed compiler warnings when using clang\n - added: Added clang++ to Make.config (as optional compiler)\n\n
Diffstat (limited to 'Make.config')
| -rw-r--r-- | Make.config | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/Make.config b/Make.config index 7f78843..3d8effd 100644 --- a/Make.config +++ b/Make.config @@ -2,7 +2,6 @@ # # See the README file for copyright information and how to reach the author. # -# # user defined stuff @@ -15,6 +14,7 @@ PLGDEST = $(PREFIX)/lib/epgd/plugins CONFDEST = $(DESTDIR)/etc/epgd HTTPDEST = $(DESTDIR)/var/epgd/www DEBUG = 1 +#USE_CLANG = 1 SYSTEMDDEST = $(DESTDIR)/etc/systemd/system UPSTARTDEST = $(DESTDIR)/etc/init @@ -24,14 +24,15 @@ UPSTARTDEST = $(DESTDIR)/etc/init INIT_SYSTEM = systemd INIT_AFTER = mysql.service -ifeq "$(INIT_SYSTEM)" "systemd" - SYSD_NOTIFY = 1 -endif - # ------------------ # don't touch below -CC = g++ +ifdef USE_CLANG + CC = clang++ +else + CC = g++ +endif + doCompile = $(CC) -c $(CFLAGS) $(DEFINES) doLink = $(CC) $(LFLAGS) doLib = ar -rs @@ -49,6 +50,10 @@ USEWOL = 1 USES = -DUSEUUID -DUSEMD5 -DUSELIBXML -DUSELIBARCHIVE -DUSEJSON -DUSEGUNZIP DEFINES += -D_GNU_SOURCE -DBINDEST='"$(BINDEST)"' -DTARGET='"$(TARGET)"' -DLOG_PREFIX='""' -DPLGDIR='"$(PLGDEST)"' $(USES) +ifeq "$(INIT_SYSTEM)" "systemd" + SYSD_NOTIFY = 1 +endif + ifdef SYSD_NOTIFY SYSTEMD_VERSION_210 := $(shell expr `pkg-config --modversion libsystemd 2>/dev/null || echo 0` \>= 210) SYSTEMD_VERSION_209 := $(shell expr `pkg-config --modversion libsystemd 2>/dev/null || pkg-config --modversion libsystemd-daemon 2>/dev/null || echo "0"` \>= 209) @@ -78,11 +83,19 @@ ifdef DEBUG CFLAGS += -ggdb -fno-stack-protector -O0 endif -CFLAGS += -fPIC -Wextra -Wno-unused-parameter -Wreturn-type -Wall -Wno-parentheses -Wformat -pedantic \ - -Wunused-variable -Wunused-label \ - -Werror=format-security -Wparentheses \ - -Wunused-value -Wunused-function -Wno-long-long \ - -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +CFLAGS += -fPIC -Wreturn-type -Wall -Wextra -Wparentheses -Wformat -pedantic \ + -Wno-long-long -Wunused-variable -Wunused-label -Wno-unused-result \ + -Wunused-value -Wunused-function -Wno-variadic-macros \ + -Wno-unused-parameter -Werror=format-security \ + -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + +CFLAGS += -std=c++11 -D__STDC_FORMAT_MACROS + +ifdef USE_CLANG + CFLAGS += -x c++ -Wunused-const-variable +else + CFLAGS += -Wunused-but-set-variable +endif %.o: %.c $(doCompile) -o $@ $< |