aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-03-22 11:10:43 -0400
committerWilliam Hua <william.hua@canonical.com>2013-03-22 11:10:43 -0400
commit9499e5aa98c5080c30de8af755acad4d8ccef90c (patch)
tree496cdf35faa9054835757c943242bad031871fc2
parentbd8935d6d5ae98f30287a285a41d4c9eeb018881 (diff)
downloadayatana-indicator-keyboard-9499e5aa98c5080c30de8af755acad4d8ccef90c.tar.gz
ayatana-indicator-keyboard-9499e5aa98c5080c30de8af755acad4d8ccef90c.tar.bz2
ayatana-indicator-keyboard-9499e5aa98c5080c30de8af755acad4d8ccef90c.zip
Proper linking.
-rw-r--r--configure.ac8
-rw-r--r--lib/Makefile.am7
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 93187904..380ff654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,15 +24,15 @@ AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indica
AC_SUBST([DBUS_SERVICE_DIR], [$with_dbus_service_dir])
AC_SUBST([INDICATOR_DIR], [$with_indicator_dir])
-PKG_CHECK_MODULES([GIO], [gio-2.0])
-AC_SUBST([GIO_CFLAGS])
-AC_SUBST([GIO_LIBS])
+PKG_CHECK_MODULES([GTK], [gtk+-3.0])
+AC_SUBST([GTK_CFLAGS])
+AC_SUBST([GTK_LIBS])
PKG_CHECK_MODULES([IBUS], [ibus-1.0])
AC_SUBST([IBUS_CFLAGS])
AC_SUBST([IBUS_LIBS])
-PKG_CHECK_MODULES([LIBGNOMEKBD], [libgnomekbd])
+PKG_CHECK_MODULES([LIBGNOMEKBD], [libgnomekbdui])
AC_SUBST([LIBGNOMEKBD_CFLAGS])
AC_SUBST([LIBGNOMEKBD_LIBS])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 31b18f25..cb82ac28 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,5 @@
-AM_VALAFLAGS = --vapidir $(top_srcdir)/deps
+AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
+ --vapidir $(top_srcdir)/deps
libexec_PROGRAMS = indicator-keyboard-service
@@ -8,11 +9,11 @@ indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \
--pkg ibus-1.0 \
--pkg libgnomekbd \
--pkg Xkl-1.0
-indicator_keyboard_service_CFLAGS = $(GIO_CFLAGS) \
+indicator_keyboard_service_CFLAGS = $(GTK_CFLAGS) \
$(IBUS_CFLAGS) \
$(LIBGNOMEKBD_CFLAGS) \
$(AM_CFLAGS)
-indicator_keyboard_service_LDFLAGS = $(GIO_LIBS) \
+indicator_keyboard_service_LDFLAGS = $(GTK_LIBS) \
$(IBUS_LIBS) \
$(LIBGNOMEKBD_LIBS) \
$(AM_LDFLAGS)