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 /client | |
| 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 'client')
| -rw-r--r-- | client/Makefile.am | 20 | ||||
| -rw-r--r-- | client/dconf-client.c | 2 | ||||
| -rw-r--r-- | client/dconf-client.h | 2 | ||||
| -rw-r--r-- | client/dconf.h | 1 |
4 files changed, 15 insertions, 10 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 73bdccc..0b139ed 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/Makefile.gtester -AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC -CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS) - shlibdir=$(libdir) shlib_PROGRAMS = libdconf.so.0.0.0 nodist_noinst_DATA = libdconf.so.0 libdconf.so @@ -24,12 +20,20 @@ dconfinclude_HEADERS = \ dconf-client.h \ dconf.h -libdconf_so_0_0_0_LDADD = ../common/libdconf-common-shared.a ../engine/libdconf-engine.a ../gdbus/libdconf-gdbus.a ../shm/libdconf-shm-shared.a $(gio_LIBS) -libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 -libdconf_so_0_0_0_SOURCES = \ +libdconf_client_a_CFLAGS = $(gio_CFLAGS) +libdconf_client_a_SOURCES = \ dconf-client.c -libdconf_client_a_SOURCES = dconf-client.c +libdconf_so_0_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC +libdconf_so_0_0_0_LDADD = \ + ../engine/libdconf-engine-shared.a \ + ../common/libdconf-common-shared.a \ + ../gdbus/libdconf-gdbus-thread-shared.a \ + ../gvdb/libgvdb-shared.a \ + ../shm/libdconf-shm-shared.a \ + $(gio_LIBS) +libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 +libdconf_so_0_0_0_SOURCES = $(libdconf_client_a_SOURCES) EXTRA_DIST = dconf.vapi dconf.deps diff --git a/client/dconf-client.c b/client/dconf-client.c index 1e3efc0..eced4f1 100644 --- a/client/dconf-client.c +++ b/client/dconf-client.c @@ -22,7 +22,7 @@ #include "dconf-client.h" -#include "dconf-engine.h" +#include "../engine/dconf-engine.h" #include <glib-object.h> struct _DConfClient diff --git a/client/dconf-client.h b/client/dconf-client.h index 969e2ff..d09fdbd 100644 --- a/client/dconf-client.h +++ b/client/dconf-client.h @@ -23,7 +23,7 @@ #define __dconf_client_h__ #include <gio/gio.h> -#include "dconf-changeset.h" +#include "../common/dconf-changeset.h" G_BEGIN_DECLS diff --git a/client/dconf.h b/client/dconf.h index 77f1154..21b8f70 100644 --- a/client/dconf.h +++ b/client/dconf.h @@ -23,6 +23,7 @@ #define __dconf_h__ #include <dconf-paths.h> +#include <dconf-changeset.h> #include <dconf-client.h> #endif /* __dconf_h__ */ |