diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-12-29 16:58:41 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-12-29 16:58:41 -0500 |
| commit | b8b4df32ac9c1325cd0d5c1a67a755b9f24180b6 (patch) | |
| tree | fef05233bfde31591475076a5e26618602bc6897 | |
| parent | 0bc13626b1dd2ebb1b9897fb188a119aee19597e (diff) | |
| download | dconf-b8b4df32ac9c1325cd0d5c1a67a755b9f24180b6.tar.gz | |
Fix up build order
tests/ depends on libdconf-dbus-1 so build that first. Also make sure
the proper .so files are generated.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | 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 $@ |