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 /service | |
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 'service')
-rw-r--r-- | service/Makefile.am | 12 | ||||
-rw-r--r-- | service/dconf-rebuilder.c | 4 | ||||
-rw-r--r-- | service/dconf-writer.c | 2 | ||||
-rw-r--r-- | service/dconf-writer.h | 2 | ||||
-rw-r--r-- | service/service.c | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/service/Makefile.am b/service/Makefile.am index 96ad94e..fe3afaa 100644 --- a/service/Makefile.am +++ b/service/Makefile.am @@ -1,15 +1,17 @@ include $(top_srcdir)/Makefile.gtester -AM_CFLAGS = $(gio_CFLAGS) -I$(top_srcdir)/gvdb -I$(top_srcdir)/common -I$(top_srcdir)/shm -Wall -Wmissing-prototypes -Wwrite-strings - libexec_PROGRAMS = dconf-service dbusservice_DATA = ca.desrt.dconf.service -dconf_service_LDADD = $(gio_LIBS) ../common/libdconf-common.a ../shm/libdconf-shm.a +dconf_service_CFLAGS = $(gio_CFLAGS) +dconf_service_LDADD = \ + ../common/libdconf-common.a \ + ../gvdb/libgvdb.a \ + ../shm/libdconf-shm.a \ + $(gio_LIBS) + dconf_service_SOURCES = \ - ../gvdb/gvdb-builder.c \ - ../gvdb/gvdb-reader.c \ dconf-interfaces.h \ dconf-interfaces.c \ dconf-rebuilder.h \ diff --git a/service/dconf-rebuilder.c b/service/dconf-rebuilder.c index 65271cd..9cac1a7 100644 --- a/service/dconf-rebuilder.c +++ b/service/dconf-rebuilder.c @@ -23,8 +23,8 @@ #include <string.h> -#include "gvdb-reader.h" -#include "gvdb-builder.h" +#include "../gvdb/gvdb-reader.h" +#include "../gvdb/gvdb-builder.h" typedef struct { diff --git a/service/dconf-writer.c b/service/dconf-writer.c index 6c44c40..c6cda13 100644 --- a/service/dconf-writer.c +++ b/service/dconf-writer.c @@ -23,7 +23,7 @@ #include "dconf-rebuilder.h" #include "dconf-state.h" -#include "dconf-shm.h" +#include "../shm/dconf-shm.h" #include <stdlib.h> #include <unistd.h> diff --git a/service/dconf-writer.h b/service/dconf-writer.h index cbabadb..8f391fe 100644 --- a/service/dconf-writer.h +++ b/service/dconf-writer.h @@ -22,7 +22,7 @@ #ifndef __dconf_writer_h__ #define __dconf_writer_h__ -#include "dconf-changeset.h" +#include "../common/dconf-changeset.h" #include "dconf-state.h" typedef struct OPAQUE_TYPE__DConfWriter DConfWriter; diff --git a/service/service.c b/service/service.c index 19eadb2..4c87477 100644 --- a/service/service.c +++ b/service/service.c @@ -26,7 +26,7 @@ #include <stdio.h> #include "dconf-interfaces.h" -#include "dconf-changeset.h" +#include "../common/dconf-changeset.h" #include "dconf-writer.h" #include "dconf-state.h" |