aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog64
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in1
-rwxr-xr-xconfigure247
-rw-r--r--configure.ac44
-rw-r--r--libindicator/Makefile.am27
-rw-r--r--libindicator/Makefile.in167
-rw-r--r--libindicator/indicator3.pc.in17
-rw-r--r--tests/Makefile.am18
-rw-r--r--tests/Makefile.in31
-rw-r--r--tools/80indicator-debugging14
-rw-r--r--tools/Makefile.am12
-rw-r--r--tools/Makefile.in70
14 files changed, 607 insertions, 108 deletions
diff --git a/AUTHORS b/AUTHORS
index c90b64b..848b440 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@
Eitan Isaacson
Karl
Martin Pitt
+ Michael Terry
Mikkel Kamstrup Erlandsen
Neil Jagdish Patel
Robert Carr
diff --git a/ChangeLog b/ChangeLog
index 2ccf8b8..9e3b36c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,69 @@
# Generated by Makefile. Do not edit.
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Fixing the ignore file tarball matching
+
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Merging in the GTK3 basis for the build
+
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Making sure to get both pc files in the tarball
+
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Checking for deprecations and making sure we check on distcheck
+
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Putting the GTK3 indicators in a different directory.
+
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Updating ignore for the GTK3 stuff
+
+2010-11-11 Ted Gould <ted@gould.cx>
+
+ Merging in trunk to solve conflicts
+
+2010-10-06 Michael Terry <mike@mterry.name>
+
+ instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with
+
+2010-06-19 Michael Terry <michael.terry@canonical.com>
+
+ don't use 3.3 version, rather use indicator3
+
+2010-06-19 Michael Terry <michael.terry@canonical.com>
+
+ first pass at providing a gtk3 version
+
+2010-10-15 Ted Gould <ted@gould.cx>
+
+ Adding a file to have the debugging environment variables
+
+2010-10-15 Ted Gould <ted@gould.cx>
+
+ Add mean comment
+
+2010-10-15 Ted Gould <ted@gould.cx>
+
+ Adding a number in the name
+
+2010-10-15 Ted Gould <ted@gould.cx>
+
+ Installing the environment file in the session dir
+
+2010-10-15 Ted Gould <ted@gould.cx>
+
+ All the environment flags we should set for debugging
+
+2010-09-21 Ted Gould <ted@gould.cx>
+
+ 0.3.14
+
2010-09-21 Ted Gould <ted@gould.cx>
Changing AUTHORS to mention it's built
diff --git a/Makefile.am b/Makefile.am
index f290d63..c955c6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = \
tests \
tools
+DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations
+
DISTCLEANFILES = \
libindicator-*.tar.gz
diff --git a/Makefile.in b/Makefile.in
index 75e695e..1dba7dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -237,6 +237,7 @@ SUBDIRS = \
tests \
tools
+DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations
DISTCLEANFILES = \
libindicator-*.tar.gz
diff --git a/configure b/configure
index a18a68f..817306d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libindicator 0.3.14.
+# Generated by GNU Autoconf 2.67 for libindicator 0.3.15.
#
# Report bugs to <ted@canonical.com>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libindicator'
PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.3.14'
-PACKAGE_STRING='libindicator 0.3.14'
+PACKAGE_VERSION='0.3.15'
+PACKAGE_STRING='libindicator 0.3.15'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -752,6 +752,8 @@ LIBDIR
SYSCONFDIR
PREFIX
EXPANDED_SYSCONFDIR
+USE_GTK3_FALSE
+USE_GTK3_TRUE
LIBINDICATOR_LIBS
LIBINDICATOR_CFLAGS
PKG_CONFIG_LIBDIR
@@ -881,6 +883,8 @@ with_pic
enable_fast_install
with_gnu_ld
enable_libtool_lock
+enable_deprecations
+with_gtk
enable_debug
'
ac_precious_vars='build_alias
@@ -1439,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libindicator 0.3.14 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libindicator 0.3.14:";;
+ short | recursive ) echo "Configuration of libindicator 0.3.15:";;
esac
cat <<\_ACEOF
@@ -1528,6 +1532,7 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-deprecations allow deprecated API usage [default=yes]
--enable-debug build with debug symbols
Optional Packages:
@@ -1536,6 +1541,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-gtk Which version of gtk to use [default=2]
Some influential environment variables:
CC C compiler command
@@ -1622,7 +1628,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libindicator configure 0.3.14
+libindicator configure 0.3.15
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1900,7 +1906,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libindicator $as_me 0.3.14, which was
+It was created by libindicator $as_me 0.3.15, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2720,7 +2726,7 @@ fi
# Define the identity of the package.
PACKAGE=libindicator
- VERSION=0.3.14
+ VERSION=0.3.15
cat >>confdefs.h <<_ACEOF
@@ -5556,13 +5562,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5559: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5565: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5562: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5568: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5565: output\"" >&5)
+ (eval echo "\"\$as_me:5571: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6767,7 +6773,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6770 "configure"' > conftest.$ac_ext
+ echo '#line 6776 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8042,11 +8048,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8045: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8051: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8049: \$? = $ac_status" >&5
+ echo "$as_me:8055: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8381,11 +8387,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8384: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8390: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8388: \$? = $ac_status" >&5
+ echo "$as_me:8394: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8486,11 +8492,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8489: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8495: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8493: \$? = $ac_status" >&5
+ echo "$as_me:8499: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8541,11 +8547,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8544: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8550: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8548: \$? = $ac_status" >&5
+ echo "$as_me:8554: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10925,7 +10931,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10928 "configure"
+#line 10934 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11021,7 +11027,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11024 "configure"
+#line 11030 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11347,15 +11353,36 @@ esac
AM_BACKSLASH='\'
+# Check whether --enable-deprecations was given.
+if test "${enable_deprecations+set}" = set; then :
+ enableval=$enable_deprecations;
+else
+ enable_deprecations=yes
+fi
+
+if test "x$enable_deprecations" = xno; then :
+ CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"
+
+fi
+
##############################
# Dependencies
##############################
GTK_REQUIRED_VERSION=2.18
+GTK3_REQUIRED_VERSION=2.91
DBUS_REQUIRED_VERSION=0.76
GIO_UNIX_REQUIRED_VERSION=2.22
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then :
+ withval=$with_gtk;
+else
+ with_gtk=2
+fi
+
+
@@ -11474,6 +11501,118 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
+if test "x$with_gtk" = x3; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATOR" >&5
+$as_echo_n "checking for LIBINDICATOR... " >&6; }
+
+if test -n "$LIBINDICATOR_CFLAGS"; then
+ pkg_cv_LIBINDICATOR_CFLAGS="$LIBINDICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBINDICATOR_LIBS"; then
+ pkg_cv_LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+ else
+ LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBINDICATOR_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met:
+
+$LIBINDICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBINDICATOR_CFLAGS
+and LIBINDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBINDICATOR_CFLAGS
+and LIBINDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+ LIBINDICATOR_CFLAGS=$pkg_cv_LIBINDICATOR_CFLAGS
+ LIBINDICATOR_LIBS=$pkg_cv_LIBINDICATOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
+elif test "x$with_gtk" = x2; then :
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATOR" >&5
@@ -11484,17 +11623,17 @@ if test -n "$LIBINDICATOR_CFLAGS"; then
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
- gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+ gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11506,17 +11645,17 @@ if test -n "$LIBINDICATOR_LIBS"; then
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
- gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+ gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11537,19 +11676,19 @@ else
fi
if test $_pkg_short_errors_supported = yes; then
LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
else
LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBINDICATOR_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met:
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met:
$LIBINDICATOR_PKG_ERRORS
@@ -11584,6 +11723,21 @@ fi
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Value for --with-gtk was neither 2 nor 3
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+fi
+ if test "x$with_gtk" = x3; then
+ USE_GTK3_TRUE=
+ USE_GTK3_FALSE='#'
+else
+ USE_GTK3_TRUE='#'
+ USE_GTK3_FALSE=
+fi
+
##############################
# Custom Junk
@@ -11686,7 +11840,7 @@ fi
# Files
###########################
-ac_config_files="$ac_config_files Makefile libindicator/Makefile libindicator/indicator.pc tests/Makefile tools/Makefile"
+ac_config_files="$ac_config_files Makefile libindicator/Makefile libindicator/indicator.pc libindicator/indicator3.pc tests/Makefile tools/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -11810,6 +11964,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${USE_GTK3_TRUE}" && test -z "${USE_GTK3_FALSE}"; then
+ as_fn_error $? "conditional \"USE_GTK3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -12222,7 +12380,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libindicator $as_me 0.3.14, which was
+This file was extended by libindicator $as_me 0.3.15, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12288,7 +12446,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libindicator config.status 0.3.14
+libindicator config.status 0.3.15
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
@@ -12678,6 +12836,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libindicator/Makefile") CONFIG_FILES="$CONFIG_FILES libindicator/Makefile" ;;
"libindicator/indicator.pc") CONFIG_FILES="$CONFIG_FILES libindicator/indicator.pc" ;;
+ "libindicator/indicator3.pc") CONFIG_FILES="$CONFIG_FILES libindicator/indicator3.pc" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
@@ -14050,6 +14209,7 @@ fi
Libindicator Configuration:
Prefix: $prefix
+ GTK+ Version: $with_gtk
Enable debugging: $enable_debug
" >&5
@@ -14058,6 +14218,7 @@ $as_echo "$as_me:
Libindicator Configuration:
Prefix: $prefix
+ GTK+ Version: $with_gtk
Enable debugging: $enable_debug
" >&6;}
diff --git a/configure.ac b/configure.ac
index d9a6240..365ebea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT(libindicator, 0.3.14, ted@canonical.com)
+AC_INIT(libindicator, 0.3.15, ted@canonical.com)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicator, 0.3.14)
+AM_INIT_AUTOMAKE(libindicator, 0.3.15)
AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -24,20 +24,46 @@ AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AC_ARG_ENABLE([deprecations],
+ [AS_HELP_STRING([--enable-deprecations],
+ [allow deprecated API usage @<:@default=yes@:>@])],
+ [],
+ [enable_deprecations=yes])
+AS_IF([test "x$enable_deprecations" = xno],
+ [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
+)
+
##############################
# Dependencies
##############################
GTK_REQUIRED_VERSION=2.18
+GTK3_REQUIRED_VERSION=2.91
DBUS_REQUIRED_VERSION=0.76
GIO_UNIX_REQUIRED_VERSION=2.22
-PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
-
-AC_SUBST(LIBINDICATOR_CFLAGS)
-AC_SUBST(LIBINDICATOR_LIBS)
+AC_ARG_WITH([gtk],
+ [AS_HELP_STRING([--with-gtk],
+ [Which version of gtk to use @<:@default=2@:>@])],
+ [],
+ [with_gtk=2])
+AS_IF([test "x$with_gtk" = x3],
+ [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
+ AC_SUBST(LIBINDICATOR_CFLAGS)
+ AC_SUBST(LIBINDICATOR_LIBS)
+ ],
+ [test "x$with_gtk" = x2],
+ [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
+ AC_SUBST(LIBINDICATOR_CFLAGS)
+ AC_SUBST(LIBINDICATOR_LIBS)
+ ],
+ [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
+)
+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
##############################
# Custom Junk
@@ -106,6 +132,7 @@ AC_OUTPUT([
Makefile
libindicator/Makefile
libindicator/indicator.pc
+libindicator/indicator3.pc
tests/Makefile
tools/Makefile
])
@@ -119,6 +146,7 @@ AC_MSG_NOTICE([
Libindicator Configuration:
Prefix: $prefix
+ GTK+ Version: $with_gtk
Enable debugging: $enable_debug
])
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index f942f0d..39cb2b7 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -1,12 +1,21 @@
+if USE_GTK3
+VER=3
+lib_LTLIBRARIES = libindicator3.la
+else
+VER=
+lib_LTLIBRARIES = libindicator.la
+endif
+
BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST = \
+ indicator3.pc.in \
indicator.pc.in
include $(top_srcdir)/Makefile.am.marshal
-libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator
+libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator
indicator_headers = \
indicator.h \
@@ -19,9 +28,6 @@ indicator_headers = \
libindicatorinclude_HEADERS = \
$(indicator_headers)
-lib_LTLIBRARIES = \
- libindicator.la
-
libindicator_la_SOURCES = \
$(indicator_headers) \
dbus-shared.h \
@@ -47,7 +53,18 @@ libindicator_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex "^[^_].*"
-pkgconfig_DATA = indicator.pc
+# We duplicate these here because Automake won't let us use $(VER) on the left hand side.
+# Since we carefully use $(VER) in the right hand side above, we can assign the same values.
+# Only one version of the library is every compiled at the same time, so it is safe to reuse
+# the right hand sides like this.
+libindicator3includedir = $(libindicatorincludedir)
+libindicator3include_HEADERS = $(indicator_headers)
+libindicator3_la_SOURCES = $(libindicator_la_SOURCES)
+libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS)
+libindicator3_la_LIBADD = $(libindicator_la_LIBADD)
+libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS)
+
+pkgconfig_DATA = indicator$(VER).pc
pkgconfigdir = $(libdir)/pkgconfig
glib_marshal_list = indicator-object-marshal.list
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index 209f524..63e81e1 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -52,9 +52,10 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(libindicatorinclude_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(libindicator3include_HEADERS) \
+ $(libindicatorinclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/indicator.pc.in \
- $(top_srcdir)/Makefile.am.marshal
+ $(srcdir)/indicator3.pc.in $(top_srcdir)/Makefile.am.marshal
subdir = libindicator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -62,7 +63,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = indicator.pc
+CONFIG_CLEAN_FILES = indicator.pc indicator3.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -86,6 +87,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(libindicator3includedir)" \
"$(DESTDIR)$(libindicatorincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -107,6 +109,23 @@ libindicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libindicator_la_CFLAGS) $(CFLAGS) $(libindicator_la_LDFLAGS) \
$(LDFLAGS) -o $@
+@USE_GTK3_FALSE@am_libindicator_la_rpath = -rpath $(libdir)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+libindicator3_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__objects_2 = $(am__objects_1) libindicator3_la-indicator-object.lo \
+ libindicator3_la-indicator-object-enum-types.lo \
+ libindicator3_la-indicator-desktop-shortcuts.lo \
+ libindicator3_la-indicator-image-helper.lo \
+ libindicator3_la-indicator-object-marshal.lo \
+ libindicator3_la-indicator-service.lo \
+ libindicator3_la-indicator-service-manager.lo
+am_libindicator3_la_OBJECTS = $(am__objects_2)
+libindicator3_la_OBJECTS = $(am_libindicator3_la_OBJECTS)
+libindicator3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libindicator3_la_CFLAGS) $(CFLAGS) \
+ $(libindicator3_la_LDFLAGS) $(LDFLAGS) -o $@
+@USE_GTK3_TRUE@am_libindicator3_la_rpath = -rpath $(libdir)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -133,10 +152,11 @@ am__v_CCLD_0 = @echo " CCLD " $@;
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libindicator_la_SOURCES)
-DIST_SOURCES = $(libindicator_la_SOURCES)
+SOURCES = $(libindicator_la_SOURCES) $(libindicator3_la_SOURCES)
+DIST_SOURCES = $(libindicator_la_SOURCES) $(libindicator3_la_SOURCES)
DATA = $(pkgconfig_DATA)
-HEADERS = $(libindicatorinclude_HEADERS)
+HEADERS = $(libindicator3include_HEADERS) \
+ $(libindicatorinclude_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -264,6 +284,10 @@ 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
+@USE_GTK3_FALSE@lib_LTLIBRARIES = libindicator.la
+@USE_GTK3_TRUE@lib_LTLIBRARIES = libindicator3.la
BUILT_SOURCES = indicator-object-enum-types.h \
indicator-object-enum-types.c $(marshal_h) $(marshal_c) \
$(DBUS_SPECS:.xml=-client.h) $(DBUS_SPECS:.xml=-server.h)
@@ -271,12 +295,12 @@ CLEANFILES = stamp-marshal indicator-object-enum-types.h \
indicator-object-enum-types.c s-enum-types-h s-enum-types-c \
$(BUILT_SOURCES)
DISTCLEANFILES = $(marshal_h) $(marshal_c)
-EXTRA_DIST = indicator.pc.in $(glib_marshal_list) \
+EXTRA_DIST = indicator3.pc.in indicator.pc.in $(glib_marshal_list) \
indicator-object-enum-types.h.template \
indicator-object-enum-types.c.template $(DBUS_SPECS)
marshal_h = $(glib_marshal_list:.list=.h)
marshal_c = $(glib_marshal_list:.list=.c)
-libindicatorincludedir = $(includedir)/libindicator-0.3/libindicator
+libindicatorincludedir = $(includedir)/libindicator$(VER)-0.3/libindicator
indicator_headers = \
indicator.h \
indicator-desktop-shortcuts.h \
@@ -288,9 +312,6 @@ indicator_headers = \
libindicatorinclude_HEADERS = \
$(indicator_headers)
-lib_LTLIBRARIES = \
- libindicator.la
-
libindicator_la_SOURCES = \
$(indicator_headers) \
dbus-shared.h \
@@ -316,7 +337,18 @@ libindicator_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex "^[^_].*"
-pkgconfig_DATA = indicator.pc
+
+# We duplicate these here because Automake won't let us use $(VER) on the left hand side.
+# Since we carefully use $(VER) in the right hand side above, we can assign the same values.
+# Only one version of the library is every compiled at the same time, so it is safe to reuse
+# the right hand sides like this.
+libindicator3includedir = $(libindicatorincludedir)
+libindicator3include_HEADERS = $(indicator_headers)
+libindicator3_la_SOURCES = $(libindicator_la_SOURCES)
+libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS)
+libindicator3_la_LIBADD = $(libindicator_la_LIBADD)
+libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS)
+pkgconfig_DATA = indicator$(VER).pc
pkgconfigdir = $(libdir)/pkgconfig
glib_marshal_list = indicator-object-marshal.list
glib_marshal_prefix = _indicator_object_marshal
@@ -364,6 +396,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
indicator.pc: $(top_builddir)/config.status $(srcdir)/indicator.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+indicator3.pc: $(top_builddir)/config.status $(srcdir)/indicator3.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@@ -396,7 +430,9 @@ clean-libLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libindicator_la_LINK) -rpath $(libdir) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libindicator_la_LINK) $(am_libindicator_la_rpath) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)
+libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libindicator3_la_LINK) $(am_libindicator3_la_rpath) $(libindicator3_la_OBJECTS) $(libindicator3_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -404,6 +440,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-image-helper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-object-enum-types.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-object-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-service-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-service.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-indicator-desktop-shortcuts.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-indicator-image-helper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-indicator-object-enum-types.Plo@am__quote@
@@ -492,6 +535,62 @@ libindicator_la-indicator-service-manager.lo: indicator-service-manager.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+libindicator3_la-indicator-object.lo: indicator-object.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object.Tpo -c -o libindicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object.Tpo $(DEPDIR)/libindicator3_la-indicator-object.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object.c' object='libindicator3_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
+
+libindicator3_la-indicator-object-enum-types.lo: indicator-object-enum-types.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object-enum-types.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object-enum-types.Tpo -c -o libindicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object-enum-types.Tpo $(DEPDIR)/libindicator3_la-indicator-object-enum-types.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object-enum-types.c' object='libindicator3_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
+
+libindicator3_la-indicator-desktop-shortcuts.lo: indicator-desktop-shortcuts.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-desktop-shortcuts.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Tpo -c -o libindicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Tpo $(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-desktop-shortcuts.c' object='libindicator3_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
+
+libindicator3_la-indicator-image-helper.lo: indicator-image-helper.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-image-helper.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-image-helper.Tpo -c -o libindicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-image-helper.Tpo $(DEPDIR)/libindicator3_la-indicator-image-helper.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-image-helper.c' object='libindicator3_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
+
+libindicator3_la-indicator-object-marshal.lo: indicator-object-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object-marshal.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object-marshal.Tpo -c -o libindicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object-marshal.Tpo $(DEPDIR)/libindicator3_la-indicator-object-marshal.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-object-marshal.c' object='libindicator3_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
+
+libindicator3_la-indicator-service.lo: indicator-service.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-service.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-service.Tpo -c -o libindicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-service.Tpo $(DEPDIR)/libindicator3_la-indicator-service.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-service.c' object='libindicator3_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
+
+libindicator3_la-indicator-service-manager.lo: indicator-service-manager.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-service-manager.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-service-manager.Tpo -c -o libindicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-service-manager.Tpo $(DEPDIR)/libindicator3_la-indicator-service-manager.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-service-manager.c' object='libindicator3_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+
mostlyclean-libtool:
-rm -f *.lo
@@ -517,6 +616,26 @@ uninstall-pkgconfigDATA:
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+install-libindicator3includeHEADERS: $(libindicator3include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(libindicator3includedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicator3includedir)"
+ @list='$(libindicator3include_HEADERS)'; test -n "$(libindicator3includedir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libindicator3includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libindicator3includedir)" || exit $$?; \
+ done
+
+uninstall-libindicator3includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libindicator3include_HEADERS)'; test -n "$(libindicator3includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libindicator3includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libindicator3includedir)" && rm -f $$files
install-libindicatorincludeHEADERS: $(libindicatorinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libindicatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicatorincludedir)"
@@ -625,7 +744,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libindicatorincludedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libindicator3includedir)" "$(DESTDIR)$(libindicatorincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -680,8 +799,8 @@ info: info-am
info-am:
-install-data-am: install-libindicatorincludeHEADERS \
- install-pkgconfigDATA
+install-data-am: install-libindicator3includeHEADERS \
+ install-libindicatorincludeHEADERS install-pkgconfigDATA
install-dvi: install-dvi-am
@@ -728,6 +847,7 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-libLTLIBRARIES \
+ uninstall-libindicator3includeHEADERS \
uninstall-libindicatorincludeHEADERS uninstall-pkgconfigDATA
.MAKE: all check install install-am install-strip
@@ -739,13 +859,14 @@ uninstall-am: uninstall-libLTLIBRARIES \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-libindicatorincludeHEADERS \
- install-man install-pdf install-pdf-am install-pkgconfigDATA \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+ install-libLTLIBRARIES install-libindicator3includeHEADERS \
+ install-libindicatorincludeHEADERS install-man install-pdf \
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-libLTLIBRARIES uninstall-libindicator3includeHEADERS \
uninstall-libindicatorincludeHEADERS uninstall-pkgconfigDATA
diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in
new file mode 100644
index 0000000..74b93c5
--- /dev/null
+++ b/libindicator/indicator3.pc.in
@@ -0,0 +1,17 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+indicatordir=${libdir}/indicators3/1/
+iconsdir=@datarootdir@/@PACKAGE@/icons/
+
+Cflags: -I${includedir}/libindicator3-0.3
+Requires: gtk+-3.0
+Libs: -lindicator3
+
+Name: libindicator3
+Description: libindicator3.
+Version: @VERSION@
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9d5e496..da33551 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,9 @@
+if USE_GTK3
+INDICATOR_LIB = -lindicator3
+else
+INDICATOR_LIB = -lindicator
+endif
+
TESTS =
DISTCLEANFILES =
@@ -31,7 +37,7 @@ test_loader_CFLAGS = \
test_loader_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
#############################
# Test Desktop Shortcuts
@@ -51,7 +57,7 @@ test_desktop_shortcuts_CFLAGS = \
test_desktop_shortcuts_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
DS_XML_REPORT = desktop-shortcuts-check-results.xml
DS_HTML_REPORT = desktop-shortcuts-check-results.html
@@ -83,7 +89,7 @@ libdummy_indicator_blank_la_CFLAGS = \
libdummy_indicator_blank_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_blank_la_LDFLAGS = \
-module \
@@ -103,7 +109,7 @@ libdummy_indicator_null_la_CFLAGS = \
libdummy_indicator_null_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_null_la_LDFLAGS = \
-module \
@@ -123,7 +129,7 @@ libdummy_indicator_signaler_la_CFLAGS = \
libdummy_indicator_signaler_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_signaler_la_LDFLAGS = \
-module \
@@ -143,7 +149,7 @@ libdummy_indicator_simple_la_CFLAGS = \
libdummy_indicator_simple_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_simple_la_LDFLAGS = \
-module \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5c01ece..fe1948a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -80,7 +80,8 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libdummy_indicator_blank_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libdummy_indicator_blank_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libdummy_indicator_blank_la_OBJECTS = \
libdummy_indicator_blank_la-dummy-indicator-blank.lo
libdummy_indicator_blank_la_OBJECTS = \
@@ -92,7 +93,8 @@ libdummy_indicator_blank_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libdummy_indicator_blank_la_CFLAGS) $(CFLAGS) \
$(libdummy_indicator_blank_la_LDFLAGS) $(LDFLAGS) -o $@
-libdummy_indicator_null_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libdummy_indicator_null_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libdummy_indicator_null_la_OBJECTS = \
libdummy_indicator_null_la-dummy-indicator-null.lo
libdummy_indicator_null_la_OBJECTS = \
@@ -101,7 +103,8 @@ libdummy_indicator_null_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libdummy_indicator_null_la_CFLAGS) $(CFLAGS) \
$(libdummy_indicator_null_la_LDFLAGS) $(LDFLAGS) -o $@
-libdummy_indicator_signaler_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libdummy_indicator_signaler_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libdummy_indicator_signaler_la_OBJECTS = \
libdummy_indicator_signaler_la-dummy-indicator-signaler.lo
libdummy_indicator_signaler_la_OBJECTS = \
@@ -110,7 +113,8 @@ libdummy_indicator_signaler_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libdummy_indicator_signaler_la_CFLAGS) $(CFLAGS) \
$(libdummy_indicator_signaler_la_LDFLAGS) $(LDFLAGS) -o $@
-libdummy_indicator_simple_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libdummy_indicator_simple_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libdummy_indicator_simple_la_OBJECTS = \
libdummy_indicator_simple_la-dummy-indicator-simple.lo
libdummy_indicator_simple_la_OBJECTS = \
@@ -227,14 +231,15 @@ service_version_multiwatch_service_LINK = $(LIBTOOL) $(AM_V_lt) \
am_test_desktop_shortcuts_OBJECTS = \
test_desktop_shortcuts-test-desktop-shortcuts.$(OBJEXT)
test_desktop_shortcuts_OBJECTS = $(am_test_desktop_shortcuts_OBJECTS)
-test_desktop_shortcuts_DEPENDENCIES = $(am__DEPENDENCIES_1)
+test_desktop_shortcuts_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
test_desktop_shortcuts_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(test_desktop_shortcuts_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_test_loader_OBJECTS = test_loader-test-loader.$(OBJEXT)
test_loader_OBJECTS = $(am_test_loader_OBJECTS)
-test_loader_DEPENDENCIES = $(am__DEPENDENCIES_1)
+test_loader_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
test_loader_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_loader_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -425,6 +430,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
+@USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
TESTS = test-desktop-shortcuts-tester service-shutdown-timeout-tester \
service-manager-no-connect-tester \
service-manager-connect-tester service-version-tester \
@@ -460,7 +467,7 @@ test_loader_CFLAGS = \
test_loader_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
test_desktop_shortcuts_SOURCES = \
test-desktop-shortcuts.c
@@ -474,7 +481,7 @@ test_desktop_shortcuts_CFLAGS = \
test_desktop_shortcuts_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
DS_XML_REPORT = desktop-shortcuts-check-results.xml
DS_HTML_REPORT = desktop-shortcuts-check-results.html
@@ -492,7 +499,7 @@ libdummy_indicator_blank_la_CFLAGS = \
libdummy_indicator_blank_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_blank_la_LDFLAGS = \
-module \
@@ -512,7 +519,7 @@ libdummy_indicator_null_la_CFLAGS = \
libdummy_indicator_null_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_null_la_LDFLAGS = \
-module \
@@ -532,7 +539,7 @@ libdummy_indicator_signaler_la_CFLAGS = \
libdummy_indicator_signaler_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_signaler_la_LDFLAGS = \
-module \
@@ -552,7 +559,7 @@ libdummy_indicator_simple_la_CFLAGS = \
libdummy_indicator_simple_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
libdummy_indicator_simple_la_LDFLAGS = \
-module \
diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging
new file mode 100644
index 0000000..f21559c
--- /dev/null
+++ b/tools/80indicator-debugging
@@ -0,0 +1,14 @@
+# These are environment variables that effect the behavior
+# of libindicator's service manager and indicator service
+# objects. They turn off various robustness features that
+# make debugging difficult and are not recommended for
+# daily use. Development use only!
+
+# Timeout after 1 minute
+export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=60000
+
+# If no one connects, still stay alive
+export INDICATOR_ALLOW_NO_WATCHERS=1
+
+# Don't restart the services if they crash
+export INDICATOR_SERVICE_RESTART_DISABLE=1
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5e5ef8d..6c67491 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,8 @@
+if USE_GTK3
+INDICATOR_LIB = -lindicator3
+else
+INDICATOR_LIB = -lindicator
+endif
libexec_PROGRAMS = \
indicator-loader
@@ -17,5 +22,10 @@ indicator_loader_CFLAGS = \
indicator_loader_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
+xsessiondir = $(sysconfdir)/X11/Xsession.d
+
+xsession_DATA = 80indicator-debugging
+
+EXTRA_DIST = $(xsession_DATA)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8c6b3b0..f5a77ff 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -15,6 +15,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -45,13 +46,14 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(libexecdir)"
+am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(xsessiondir)"
PROGRAMS = $(libexec_PROGRAMS)
am_indicator_loader_OBJECTS = \
indicator_loader-indicator-loader.$(OBJEXT)
indicator_loader_OBJECTS = $(am_indicator_loader_OBJECTS)
am__DEPENDENCIES_1 =
-indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1)
+indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
@@ -87,6 +89,28 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(indicator_loader_SOURCES)
DIST_SOURCES = $(indicator_loader_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+DATA = $(xsession_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -214,6 +238,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
+@USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
#############################
# Indicator Loader
@@ -229,8 +255,11 @@ indicator_loader_CFLAGS = \
indicator_loader_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
+xsessiondir = $(sysconfdir)/X11/Xsession.d
+xsession_DATA = 80indicator-debugging
+EXTRA_DIST = $(xsession_DATA)
all: all-am
.SUFFIXES:
@@ -365,6 +394,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-xsessionDATA: $(xsession_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(xsessiondir)" || $(MKDIR_P) "$(DESTDIR)$(xsessiondir)"
+ @list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsessiondir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(xsessiondir)" || exit $$?; \
+ done
+
+uninstall-xsessionDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(xsessiondir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(xsessiondir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -450,9 +499,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(libexecdir)"; do \
+ for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(xsessiondir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -503,7 +552,7 @@ info: info-am
info-am:
-install-data-am:
+install-data-am: install-xsessionDATA
install-dvi: install-dvi-am
@@ -549,7 +598,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-libexecPROGRAMS
+uninstall-am: uninstall-libexecPROGRAMS uninstall-xsessionDATA
.MAKE: install-am install-strip
@@ -561,11 +610,12 @@ uninstall-am: uninstall-libexecPROGRAMS
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am \
install-libexecPROGRAMS install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-ps install-ps-am install-strip install-xsessionDATA \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libexecPROGRAMS
+ tags uninstall uninstall-am uninstall-libexecPROGRAMS \
+ uninstall-xsessionDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:59:44 +0000