summaryrefslogtreecommitdiff
path: root/gsettings
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-08 14:41:33 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-08 14:52:03 -0400
commitdd9c1a0cad35082724bba59235af031246c06ce5 (patch)
treed87fae1e6ce41e19ca1b8506424c1801faf8cc7a /gsettings
parent4228ef3194fff11dcdcdce0b61aa0474fffb066d (diff)
downloaddconf-dd9c1a0cad35082724bba59235af031246c06ce5.tar.gz
clean up and factor out the 'shm' code
Remove the shm code from the engine and the service and put it in a separate convenience library in shm/. Remove the vestigial shmdir weirdness from the service (since shmdir is now always relative to XDG_RUNTIME_DIR and has been for some time). The purpose of this is so that dconf-engine can be properly unit-tested. dconf-engine now has five points of contact with the world (excluding the users of the engine themselves): - the DCONF_PROFILE environment variable - fopen() of profile files - shm - gvdb - dbus The environment variable is quite easily controlled. fopen() is intercepted in the engine testcase with a interpose of the libc symbol. With this commit now each of dbus, gvdb and shm are implemented in separate utility modules that can be mocked from the testcases.
Diffstat (limited to 'gsettings')
-rw-r--r--gsettings/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index 1abcf36..d218f7e 100644
--- a/gsettings/Makefile.am
+++ b/gsettings/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(
giomodules_PROGRAMS = libdconfsettings.so
-libdconfsettings_so_LDADD = $(gio_LIBS) ../engine/libdconf-engine.a ../gdbus/libdconf-gdbus.a ../common/libdconf-common-shared.a
+libdconfsettings_so_LDADD = $(gio_LIBS) ../engine/libdconf-engine.a ../gdbus/libdconf-gdbus.a ../common/libdconf-common-shared.a ../shm/libdconf-shm-shared.a
libdconfsettings_so_LDFLAGS = -shared
libdconfsettings_so_SOURCES = \
../gvdb/gvdb-reader.c \