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 /bin | |
| 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 'bin')
| -rw-r--r-- | bin/Makefile.am | 19 | ||||
| -rw-r--r-- | bin/gvdb.vapi | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index 5d5de60..b500f7a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,14 +1,23 @@ include $(top_srcdir)/Makefile.gtester -AM_CFLAGS = -Wall -Wmissing-prototypes -Wwrite-strings -CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/engine -I$(top_srcdir)/client -I$(top_srcdir)/gvdb $(gio_CFLAGS) +INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/client bin_PROGRAMS = dconf dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf -dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0 -dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi + +dconf_CFLAGS = $(gio_CFLAGS) + +dconf_LDADD = \ + ../client/libdconf.so.0 \ + $(gio_LIBS) + +dconf_SOURCES = \ + ../gvdb/gvdb-builder.c \ + gvdb.vapi \ + dconf-update.vala \ + dconf-dump.vala \ + dconf.vala completiondir = $(sysconfdir)/bash_completion.d completion_DATA = dconf-bash-completion.sh diff --git a/bin/gvdb.vapi b/bin/gvdb.vapi index 1848c1d..1f3e92a 100644 --- a/bin/gvdb.vapi +++ b/bin/gvdb.vapi @@ -1,4 +1,4 @@ -[CCode (cheader_filename = "gvdb-builder.h")] +[CCode (cheader_filename = "../gvdb/gvdb-builder.h")] namespace Gvdb { [Compact] [CCode (cname = "GHashTable")] |