diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2012-07-08 21:47:23 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2012-07-08 21:47:23 -0400 |
| commit | d56a9ce678101d6dc66e0d322d5f33e04bbc98fc (patch) | |
| tree | 8a3e37f9faa37b27c5f762775367fe03d92b1364 /gsettings | |
| parent | 792a13279603b2533961a48b778514c805ef39cd (diff) | |
| download | dconf-d56a9ce678101d6dc66e0d322d5f33e04bbc98fc.tar.gz | |
massive Makefile reorganisation
Clean up the Makefiles and make them as similar as possible.
Move CFLAGS to a common point of definition and stop using -I so much.
Replace the 'dbus stub' with libdconf-mock.a in tests/. Fill in some
stubs for future mock code for shm and gvdb (just to get things
compiling for now).
Diffstat (limited to 'gsettings')
| -rw-r--r-- | gsettings/Makefile.am | 14 | ||||
| -rw-r--r-- | gsettings/dconfsettingsbackend.c | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am index d218f7e..45fe320 100644 --- a/gsettings/Makefile.am +++ b/gsettings/Makefile.am @@ -1,14 +1,18 @@ include $(top_srcdir)/Makefile.gtester -AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS) - giomodules_PROGRAMS = libdconfsettings.so -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_LDADD = \ + ../engine/libdconf-engine-shared.a \ + ../gvdb/libgvdb-shared.a \ + ../gdbus/libdconf-gdbus-thread-shared.a \ + ../common/libdconf-common-shared.a \ + ../shm/libdconf-shm-shared.a \ + $(gio_LIBS) + +libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC libdconfsettings_so_LDFLAGS = -shared libdconfsettings_so_SOURCES = \ - ../gvdb/gvdb-reader.c \ dconfcontext.h \ dconfcontext.c \ dconfsettingsbackend.c diff --git a/gsettings/dconfsettingsbackend.c b/gsettings/dconfsettingsbackend.c index 53a982c..60458bd 100644 --- a/gsettings/dconfsettingsbackend.c +++ b/gsettings/dconfsettingsbackend.c @@ -21,7 +21,7 @@ #define G_SETTINGS_ENABLE_BACKEND #include <gio/gsettingsbackend.h> -#include <dconf-engine.h> +#include "../engine/dconf-engine.h" #include <gio/gio.h> #include <string.h> |