comparison Makefile @ 2:c53bcdabbba7

Make use of GDBus for glib >= 2.25.5 From glib 2.25.5 on GDBus is available and the D-Bus GLib bindings are no longer needed.
author Guido Berhoerster <guido+xwrited@berhoerster.name>
date Sun, 27 Apr 2014 23:12:06 +0200
parents 52694b49dcc4
children 6e2d746b06ae
comparison
equal deleted inserted replaced
1:0907cc7064d4 2:c53bcdabbba7
51 sysconfdir ?= /etc 51 sysconfdir ?= /etc
52 xdgautostartdir ?= $(sysconfdir)/xdg/autostart 52 xdgautostartdir ?= $(sysconfdir)/xdg/autostart
53 53
54 OS_NAME := $(shell uname -s) 54 OS_NAME := $(shell uname -s)
55 55
56 PKGCONFIG_LIBS := dbus-1 glib-2.0 dbus-glib-1 libnotify 56 PKGCONFIG_LIBS := dbus-1 glib-2.0 libnotify
57 EXTRA_LIBS := 57 EXTRA_LIBS :=
58 58
59 ifeq ($(OS_NAME),Linux) 59 ifeq ($(OS_NAME),Linux)
60 OBJS_UTMP := xwrited-utmp-utempter.o 60 OBJS_UTMP := xwrited-utmp-utempter.o
61 EXTRA_LIBS += -lutempter 61 EXTRA_LIBS += -lutempter
62 else ifeq ($(OS_NAME),FreeBSD) 62 else ifeq ($(OS_NAME),FreeBSD)
63 OBJS_UTMP := xwrited-utmp-utempter.o 63 OBJS_UTMP := xwrited-utmp-utempter.o
64 EXTRA_LIBS += -lutempter 64 EXTRA_LIBS += -lutempter
65 else 65 else
66 OBJS_UTMP := xwrited-utmp-utmpx.o 66 OBJS_UTMP := xwrited-utmp-utmpx.o
67 endif
68
69 ifeq ($(shell pkg-config --exists 'glib-2.0 >= 2.25.5' && printf "true"), true)
70 CPPFLAGS_EXTRA := -DHAVE_GLIB_GDBUS
71 else
72 PKGCONFIG_LIBS += dbus-glib-1
67 endif 73 endif
68 74
69 OBJS = main.o xwrited-debug.o xwrited-unique.o $(OBJS_UTMP) 75 OBJS = main.o xwrited-debug.o xwrited-unique.o $(OBJS_UTMP)
70 AUTOSTART_FILE = $(PACKAGE).desktop 76 AUTOSTART_FILE = $(PACKAGE).desktop
71 MOFILES := $(patsubst %.po,%.mo,$(wildcard po/*.po)) 77 MOFILES := $(patsubst %.po,%.mo,$(wildcard po/*.po))