summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-05 23:28:40 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-06 00:19:45 -0400
commitfffbf58603784608ff9eaab6ced949d89862049d (patch)
treec34b1532cd086e0489350826d7d942dd27cdf98c /client
parent8b91a50942bca2ae295ee5dd166be0fe873a231d (diff)
downloaddconf-fffbf58603784608ff9eaab6ced949d89862049d.tar.gz
client: also build libdconf-client static library
This will allow DConfClient to be included in testcases without pulling in everything else (allowing us to mock in things like the dbus backend). Reorder the toplevel Makefile so that this library gets built before we try to build tests/.
Diffstat (limited to 'client')
-rw-r--r--client/.gitignore1
-rw-r--r--client/Makefile.am3
2 files changed, 4 insertions, 0 deletions
diff --git a/client/.gitignore b/client/.gitignore
index 8cad688..f06d32b 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1,3 +1,4 @@
libdconf.so
libdconf.so.0
libdconf.so.0.0.0
+libdconf-client.a
diff --git a/client/Makefile.am b/client/Makefile.am
index 983208b..52221ee 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(
shlibdir=$(libdir)
shlib_PROGRAMS = libdconf.so.0.0.0
nodist_noinst_DATA = libdconf.so.0 libdconf.so
+noinst_LIBRARIES = libdconf-client.a
libdconf.so.0 libdconf.so: libdconf.so.0.0.0
$(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
@@ -28,6 +29,8 @@ libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0
libdconf_so_0_0_0_SOURCES = \
dconf-client.c
+libdconf_client_a_SOURCES = dconf-client.c
+
EXTRA_DIST = dconf.vapi
vapi_DATA = dconf.vapi dconf.deps