[dconf/wip/reorg: 490/498] client: also build libdconf-client static library

[Ryan Lortie <ryanl src gnome org>]

commit fffbf58603784608ff9eaab6ced949d89862049d
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jul 5 23:28:40 2012 -0400

    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/.

 Makefile.am        |    2 +-
 client/.gitignore  |    1 +
 client/Makefile.am |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6f243f7..c2a1d75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ include Makefile.gtester
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = gvdb common engine service gdbus gsettings dbus-1 tests client bin docs
+SUBDIRS = gvdb common engine service gdbus gsettings dbus-1 client bin docs tests
 
 if ENABLE_EDITOR
 SUBDIRS += editor
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