[dconf/dbus1] Fix up build order

[Ryan Lortie <ryanl src gnome org>]

commit b8b4df32ac9c1325cd0d5c1a67a755b9f24180b6
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Dec 29 16:58:41 2010 -0500

    Fix up build order
    
    tests/ depends on libdconf-dbus-1 so build that first.  Also make sure
    the proper .so files are generated.

 Makefile.am        |    2 +-
 dbus-1/Makefile.am |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 148cb94..6f23b0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = gvdb service gsettings tests client bin engine common docs dbus-1
+SUBDIRS = gvdb service gsettings dbus-1 tests client bin engine common docs
 
 if ENABLE_EDITOR
 SUBDIRS += editor
diff --git a/dbus-1/Makefile.am b/dbus-1/Makefile.am
index c9bd7ba..cb5beef 100644
--- a/dbus-1/Makefile.am
+++ b/dbus-1/Makefile.am
@@ -12,6 +12,8 @@ libdconf_dbus_1_so_0_0_0_SOURCES = \
 	../gvdb/gvdb-reader.c		\
 	dconf-dbus-1.c
 
+noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
+
 libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
 	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@