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 /common | |
| 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 'common')
| -rw-r--r-- | common/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 324f0fe..10856f2 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -4,13 +4,12 @@ dconfinclude_HEADERS = \ dconf-paths.h noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a -libdconf_common_a_CFLAGS = -Wall -INCLUDES = $(glib_CFLAGS) +libdconf_common_a_CFLAGS = $(glib_CFLAGS) libdconf_common_a_SOURCES = \ dconf-changeset.h \ dconf-changeset.c \ dconf-paths.c -libdconf_common_shared_a_CFLAGS = -fPIC -DPIC $(libdconf_common_a_CFLAGS) +libdconf_common_shared_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC libdconf_common_shared_a_SOURCES = $(libdconf_common_a_SOURCES) |