summaryrefslogtreecommitdiff
path: root/daemon/Makefile.am
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-10-26 13:57:51 +0200
committerStef Walter <stefw@collabora.co.uk>2011-10-26 13:57:51 +0200
commit3751ebf17134f724f8c28ef0a4b611ad1424903c (patch)
tree86f5c335e90f8cfc005c8363e704ae43a731ce8a /daemon/Makefile.am
parentb8f1a049401a1ca1dd062938d470b777104082ca (diff)
downloadgnome-keyring-3751ebf17134f724f8c28ef0a4b611ad1424903c.tar.gz
Build correctly with glib 2.31
* Link to gthread correctly.
Diffstat (limited to 'daemon/Makefile.am')
-rw-r--r--daemon/Makefile.am12
1 files changed, 1 insertions, 11 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c0773f5f..449a513c 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,10 +17,6 @@ INCLUDES= \
-I$(top_srcdir)/daemon \
-I$(top_builddir) \
$(DAEMON_CFLAGS) \
- $(GOBJECT_CFLAGS) \
- $(GTHREAD_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GLIB_CFLAGS) \
-DGCK_API_SUBJECT_TO_CHANGE
gnome_keyring_daemon_SOURCES = \
@@ -46,13 +42,7 @@ gnome_keyring_daemon_LDADD = \
$(top_builddir)/pkcs11/xdg-store/libgkm-xdg-store.la \
$(top_builddir)/pkcs11/gkm/libgkm.la \
$(top_builddir)/egg/libegg-dbus.la \
- $(DAEMON_LIBS) \
- $(GOBJECT_LIBS) \
- $(GTHREAD_LIBS) \
- $(GIO_LIBS) \
- $(DAEMON_LIBS) \
- $(GOBJECT_LIBS) \
- $(GLIB_LIBS)
+ $(DAEMON_LIBS)
service_in_files = \
org.gnome.keyring.service.in \