comparison Makefile @ 27:73081cc299f5

Fix support for libayatana-appindicator Fix the library name and use the correct headers.
author Guido Berhoerster <guido+pui@berhoerster.name>
date Wed, 24 Jul 2019 16:25:24 +0200
parents 3e8551a41944
children 74644b419e86
comparison
equal deleted inserted replaced
26:3e8551a41944 27:73081cc299f5
71 --keyword=g_dngettext:2,3 \ 71 --keyword=g_dngettext:2,3 \
72 --add-comments 72 --add-comments
73 INDICATOR_LIB := $(or \ 73 INDICATOR_LIB := $(or \
74 $(shell pkg-config --exists appindicator3-0.1 && \ 74 $(shell pkg-config --exists appindicator3-0.1 && \
75 printf '%s\\\n' appindicator3-0.1), \ 75 printf '%s\\\n' appindicator3-0.1), \
76 $(shell pkg-config --exists ayatana-indicator3-0.1 && \ 76 $(shell pkg-config --exists ayatana-appindicator3-0.1 && \
77 printf '%s\\\n' ayatana-indicator3-0.1), \ 77 printf '%s\\\n' ayatana-appindicator3-0.1), \
78 appindicator3-0.1) 78 appindicator3-0.1)
79 INDICATOR_FLAG := $(if $(findstring ayatana,$(INDICATOR_LIB)), \
80 -DHAVE_AYATANA_APPINDICATOR,)
79 81
80 define generate-manpage-rule = 82 define generate-manpage-rule =
81 %.$1: %.$(addsuffix .xml,$1) docbook-update-source-data.xsl 83 %.$1: %.$(addsuffix .xml,$1) docbook-update-source-data.xsl
82 $$(XSLTPROC) \ 84 $$(XSLTPROC) \
83 --xinclude \ 85 --xinclude \
154 -DVERSION=\"$(VERSION)\" \ 156 -DVERSION=\"$(VERSION)\" \
155 -DG_LOG_DOMAIN=\"$(PACKAGE)\" \ 157 -DG_LOG_DOMAIN=\"$(PACKAGE)\" \
156 -DPACKAGE_LOCALE_DIR="\"$(localedir)\"" \ 158 -DPACKAGE_LOCALE_DIR="\"$(localedir)\"" \
157 -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ 159 -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
158 -DSETTINGS_SCHEMA_ID=\"$(APPLICATION_ID)\" \ 160 -DSETTINGS_SCHEMA_ID=\"$(APPLICATION_ID)\" \
159 -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE 161 -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE \
162 $(INDICATOR_FLAG)
160 $(PACKAGE): XCFLAGS = $(shell pkg-config --cflags gtk+-3.0 \ 163 $(PACKAGE): XCFLAGS = $(shell pkg-config --cflags gtk+-3.0 \
161 $(INDICATOR_LIB) packagekit-glib2 \ 164 $(INDICATOR_LIB) packagekit-glib2 \
162 polkit-gobject-1 upower-glib) 165 polkit-gobject-1 upower-glib)
163 $(PACKAGE): LDLIBS = $(shell pkg-config --libs gtk+-3.0 \ 166 $(PACKAGE): LDLIBS = $(shell pkg-config --libs gtk+-3.0 \
164 $(INDICATOR_LIB) packagekit-glib2 \ 167 $(INDICATOR_LIB) packagekit-glib2 \