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 /gdbus | |
| 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 'gdbus')
| -rw-r--r-- | gdbus/.gitignore | 5 | ||||
| -rw-r--r-- | gdbus/Makefile.am | 23 | ||||
| -rw-r--r-- | gdbus/dconf-gdbus-filter.c | 2 | ||||
| -rw-r--r-- | gdbus/dconf-gdbus-thread.c | 2 |
4 files changed, 25 insertions, 7 deletions
diff --git a/gdbus/.gitignore b/gdbus/.gitignore index 9bc55b6..0269bef 100644 --- a/gdbus/.gitignore +++ b/gdbus/.gitignore @@ -1 +1,4 @@ -libdconf-gdbus.a +libdconf-gdbus-filter.a +libdconf-gdbus-filter-shared.a +libdconf-gdbus-thread.a +libdconf-gdbus-thread-shared.a diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am index 2486e90..cee235c 100644 --- a/gdbus/Makefile.am +++ b/gdbus/Makefile.am @@ -1,6 +1,21 @@ include $(top_srcdir)/Makefile.gtester -noinst_LIBRARIES = libdconf-gdbus.a -INCLUDES = $(glib_CFLAGS) -I$(top_srcdir)/engine -I$(top_srcdir)/common -libdconf_gdbus_a_CFLAGS = -Wall -fPIC -DPIC -libdconf_gdbus_a_SOURCES = dconf-gdbus-thread.c +noinst_LIBRARIES = \ + libdconf-gdbus-thread.a \ + libdconf-gdbus-thread-shared.a \ + libdconf-gdbus-filter.a \ + libdconf-gdbus-filter-shared.a + +libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS) +libdconf_gdbus_thread_a_SOURCES = \ + dconf-gdbus-thread.c + +libdconf_gdbus_thread_shared_a_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS) -fPIC -DPIC +libdconf_gdbus_thread_shared_a_SOURCES = $(libdconf_gdbus_thread_a_SOURCES) + +libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS) +libdconf_gdbus_filter_a_SOURCES = \ + dconf-gdbus-filter.c + +libdconf_gdbus_filter_shared_a_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS) -fPIC -DPIC +libdconf_gdbus_filter_shared_a_SOURCES = $(libdconf_gdbus_filter_a_SOURCES) diff --git a/gdbus/dconf-gdbus-filter.c b/gdbus/dconf-gdbus-filter.c index 2515a33..e074bce 100644 --- a/gdbus/dconf-gdbus-filter.c +++ b/gdbus/dconf-gdbus-filter.c @@ -1,4 +1,4 @@ -#include "dconf-engine.h" +#include "../engine/dconf-engine.h" diff --git a/gdbus/dconf-gdbus-thread.c b/gdbus/dconf-gdbus-thread.c index 3c868b5..47bc6cb 100644 --- a/gdbus/dconf-gdbus-thread.c +++ b/gdbus/dconf-gdbus-thread.c @@ -20,7 +20,7 @@ * Author: Ryan Lortie <desrt@desrt.ca> */ -#include "dconf-engine.h" +#include "../engine/dconf-engine.h" /* We interact with GDBus using a worker thread just for dconf. * |