From d56a9ce678101d6dc66e0d322d5f33e04bbc98fc Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Sun, 8 Jul 2012 21:47:23 -0400 Subject: 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). --- shm/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'shm') 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) -- cgit v1.2.1