aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-15 10:18:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-15 10:18:27 +0200
commitc4a411dddfba04f25d55feab20a0793d15401113 (patch)
tree62c52d6f376cbcd637530bb78d3d50fd4603b92d
parent0871d147746b8ff9e197df03722624ee97044b4a (diff)
downloadlibayatana-indicator-c4a411dddfba04f25d55feab20a0793d15401113.tar.gz
libayatana-indicator-c4a411dddfba04f25d55feab20a0793d15401113.tar.bz2
libayatana-indicator-c4a411dddfba04f25d55feab20a0793d15401113.zip
build system: Switch from gnome-common to mate-common.
-rwxr-xr-xautogen.sh7
-rw-r--r--debian/control2
-rw-r--r--libayatana-indicator/Makefile.in9
3 files changed, 10 insertions, 8 deletions
diff --git a/autogen.sh b/autogen.sh
index 1598fb1..cb33d0b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,10 +2,9 @@
PKG_NAME="libindicator"
-which gnome-autogen.sh || {
- echo "You need gnome-common from GNOME SVN"
+which mate-autogen || {
+ echo "You need mate-common from https://git.mate-desktop.org/mate-common."
exit 1
}
-USE_GNOME2_MACROS=1 \
-. gnome-autogen.sh
+. mate-autogen
diff --git a/debian/control b/debian/control
index 3dd42b6..4327802 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9),
dh-autoreconf,
libtool,
intltool,
- gnome-common,
+ mate-common,
gtk-doc-tools,
dbus-test-runner,
xvfb,
diff --git a/libayatana-indicator/Makefile.in b/libayatana-indicator/Makefile.in
index 021924c..f8e43e6 100644
--- a/libayatana-indicator/Makefile.in
+++ b/libayatana-indicator/Makefile.in
@@ -157,7 +157,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(libayatana_indicatorincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libayatana_indicator_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libayatana_indicator_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am__libayatana_indicator_la_SOURCES_DIST = indicator.h \
indicator-desktop-shortcuts.h indicator-image-helper.h \
indicator-object.h indicator-service.h \
@@ -192,7 +193,7 @@ libayatana_indicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(libayatana_indicator_la_CFLAGS) $(CFLAGS) \
$(libayatana_indicator_la_LDFLAGS) $(LDFLAGS) -o $@
@USE_GTK3_FALSE@am_libayatana_indicator_la_rpath = -rpath $(libdir)
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
libayatana_indicator3_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
am__libayatana_indicator3_la_SOURCES_DIST = indicator.h \
indicator-desktop-shortcuts.h indicator-image-helper.h \
@@ -354,6 +355,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -480,7 +482,8 @@ libayatana_indicator_la_CFLAGS = \
-Wall -Werror -Wno-error=deprecated-declarations
libayatana_indicator_la_LIBADD = \
- $(LIBINDICATOR_LIBS)
+ $(LIBINDICATOR_LIBS) \
+ $(LIBM)
libayatana_indicator_la_LDFLAGS = \
$(COVERAGE_LDFLAGS) \