summaryrefslogtreecommitdiff
path: root/shm
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-08 21:47:23 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-08 21:47:23 -0400
commitd56a9ce678101d6dc66e0d322d5f33e04bbc98fc (patch)
tree8a3e37f9faa37b27c5f762775367fe03d92b1364 /shm
parent792a13279603b2533961a48b778514c805ef39cd (diff)
downloaddconf-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 'shm')
-rw-r--r--shm/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/shm/Makefile.am b/shm/Makefile.am
index b3068cb..ffa2fd3 100644
--- a/shm/Makefile.am
+++ b/shm/Makefile.am
@@ -1,12 +1,11 @@
include $(top_srcdir)/Makefile.gtester
noinst_LIBRARIES = libdconf-shm.a libdconf-shm-shared.a
-libdconf_shm_a_CFLAGS = -Wall
-INCLUDES = $(glib_CFLAGS)
+libdconf_shm_a_CFLAGS = $(glib_CFLAGS)
libdconf_shm_a_SOURCES = \
dconf-shm.h \
dconf-shm.c
-libdconf_shm_shared_a_CFLAGS = -fPIC -DPIC $(libdconf_shm_a_CFLAGS)
+libdconf_shm_shared_a_CFLAGS = $(libdconf_shm_a_CFLAGS) -fPIC -DPIC
libdconf_shm_shared_a_SOURCES = $(libdconf_shm_a_SOURCES)