# HG changeset patch # User Guido Berhoerster # Date 1559499383 -7200 # Node ID b6cc1cdca785c18cf5d9f522340cc294c33e9acc # Parent 7cf8d56238e4b2cbbc5eff0da769b5f92f8e47c4 Add support for libayantana-indicator Prefer libappindicator and fall back to libayantana-indicator. diff -r 7cf8d56238e4 -r b6cc1cdca785 Makefile --- a/Makefile Tue Apr 23 11:06:32 2019 +0200 +++ b/Makefile Sun Jun 02 20:16:23 2019 +0200 @@ -70,6 +70,12 @@ --keyword=NC_:1c,2 \ --keyword=g_dngettext:2,3 \ --add-comments +INDICATOR_LIB := $(or \ + $(shell pkg-config --exists appindicator3-0.1 && \ + printf '%s\\\n' appindicator3-0.1), \ + $(shell pkg-config --exists ayantana-indicator3-0.1 && \ + printf '%s\\\n' ayantana-indicator3-0.1), \ + appindicator3-0.1) define generate-manpage-rule = %.$1: %.$(addsuffix .xml,$1) docbook-update-source-data.xsl @@ -152,10 +158,10 @@ -DSETTINGS_SCHEMA_ID=\"$(APPLICATION_ID)\" \ -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE $(PACKAGE): XCFLAGS = $(shell pkg-config --cflags gtk+-3.0 \ - appindicator3-0.1 packagekit-glib2 \ + $(INDICATOR_LIB) packagekit-glib2 \ polkit-gobject-1 upower-glib) $(PACKAGE): LDLIBS = $(shell pkg-config --libs gtk+-3.0 \ - appindicator3-0.1 packagekit-glib2 \ + $(INDICATOR_LIB) packagekit-glib2 \ polkit-gobject-1 upower-glib) $(PACKAGE)-prefs: XCPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" \