Import upstream version 0.2.92

2 files changed, 38 insertions, 29 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5e176b5..ed89981 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,9 @@
+if USE_GTK3
+VER=3
+else
+VER=
+endif
+
 
 check_PROGRAMS = \
 	test-libappindicator \
@@ -31,7 +37,7 @@ test_libappindicator_CFLAGS = \
 
 test_libappindicator_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-dbus-client
@@ -48,7 +54,7 @@ test_libappindicator_dbus_client_CFLAGS = \
 
 test_libappindicator_dbus_client_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-dbus-server
@@ -65,7 +71,7 @@ test_libappindicator_dbus_server_CFLAGS = \
 
 test_libappindicator_dbus_server_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-status-client
@@ -82,7 +88,7 @@ test_libappindicator_status_client_CFLAGS = \
 
 test_libappindicator_status_client_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-status-server
@@ -99,7 +105,7 @@ test_libappindicator_status_server_CFLAGS = \
 
 test_libappindicator_status_server_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-fallback
@@ -115,7 +121,7 @@ test_libappindicator_fallback_watcher_CFLAGS = \
 
 test_libappindicator_fallback_watcher_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 test_libappindicator_fallback_item_SOURCES = \
 	test-libappindicator-fallback-item.c
@@ -127,7 +133,7 @@ test_libappindicator_fallback_item_CFLAGS = \
 
 test_libappindicator_fallback_item_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
 	@echo "#!/bin/bash" > $@
@@ -192,5 +198,5 @@ test_simple_app_CFLAGS = \
 
 test_simple_app_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 13a2958..528c09f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -44,11 +44,8 @@ check_PROGRAMS = test-libappindicator$(EXEEXT) \
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -60,7 +57,8 @@ am_test_libappindicator_OBJECTS =  \
 test_libappindicator_OBJECTS = $(am_test_libappindicator_OBJECTS)
 am__DEPENDENCIES_1 =
 test_libappindicator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/src/libappindicator$(VER).la
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -72,7 +70,8 @@ am_test_libappindicator_dbus_client_OBJECTS = test_libappindicator_dbus_client-t
 test_libappindicator_dbus_client_OBJECTS =  \
 	$(am_test_libappindicator_dbus_client_OBJECTS)
 test_libappindicator_dbus_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/src/libappindicator$(VER).la
 test_libappindicator_dbus_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) \
@@ -81,7 +80,8 @@ am_test_libappindicator_dbus_server_OBJECTS = test_libappindicator_dbus_server-t
 test_libappindicator_dbus_server_OBJECTS =  \
 	$(am_test_libappindicator_dbus_server_OBJECTS)
 test_libappindicator_dbus_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/src/libappindicator$(VER).la
 test_libappindicator_dbus_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) \
@@ -91,7 +91,7 @@ test_libappindicator_fallback_item_OBJECTS =  \
 	$(am_test_libappindicator_fallback_item_OBJECTS)
 test_libappindicator_fallback_item_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 test_libappindicator_fallback_item_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) \
@@ -101,7 +101,7 @@ test_libappindicator_fallback_watcher_OBJECTS =  \
 	$(am_test_libappindicator_fallback_watcher_OBJECTS)
 test_libappindicator_fallback_watcher_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 test_libappindicator_fallback_watcher_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(test_libappindicator_fallback_watcher_CFLAGS) \
@@ -111,7 +111,7 @@ test_libappindicator_status_client_OBJECTS =  \
 	$(am_test_libappindicator_status_client_OBJECTS)
 test_libappindicator_status_client_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 test_libappindicator_status_client_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) \
@@ -121,7 +121,7 @@ test_libappindicator_status_server_OBJECTS =  \
 	$(am_test_libappindicator_status_server_OBJECTS)
 test_libappindicator_status_server_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 test_libappindicator_status_server_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) \
@@ -130,7 +130,8 @@ am_test_simple_app_OBJECTS =  \
 	test_simple_app-test-simple-app.$(OBJEXT)
 test_simple_app_OBJECTS = $(am_test_simple_app_OBJECTS)
 test_simple_app_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/src/libappindicator$(VER).la
 test_simple_app_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_simple_app_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
@@ -349,6 +350,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@VER = 
+@USE_GTK3_TRUE@VER = 3
 TESTS = test-libappindicator-fallback libappindicator-tests \
 	test-libappindicator-dbus test-libappindicator-status
 DISTCLEANFILES = $(TESTS) $(XML_REPORT) $(HTML_REPORT) \
@@ -371,7 +374,7 @@ test_libappindicator_CFLAGS = \
 
 test_libappindicator_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 
 #########################################
@@ -387,7 +390,7 @@ test_libappindicator_dbus_client_CFLAGS = \
 
 test_libappindicator_dbus_client_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 
 #########################################
@@ -403,7 +406,7 @@ test_libappindicator_dbus_server_CFLAGS = \
 
 test_libappindicator_dbus_server_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 
 #########################################
@@ -419,7 +422,7 @@ test_libappindicator_status_client_CFLAGS = \
 
 test_libappindicator_status_client_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 
 #########################################
@@ -435,7 +438,7 @@ test_libappindicator_status_server_CFLAGS = \
 
 test_libappindicator_status_server_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 
 #########################################
@@ -450,7 +453,7 @@ test_libappindicator_fallback_watcher_CFLAGS = \
 
 test_libappindicator_fallback_watcher_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 test_libappindicator_fallback_item_SOURCES = \
 	test-libappindicator-fallback-item.c
@@ -462,7 +465,7 @@ test_libappindicator_fallback_item_CFLAGS = \
 
 test_libappindicator_fallback_item_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 
 #########################################
@@ -484,7 +487,7 @@ test_simple_app_CFLAGS = \
 
 test_simple_app_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(top_builddir)/src/libappindicator$(VER).la
 
 all: all-am