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 /gvdb | |
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 'gvdb')
-rw-r--r-- | gvdb/.gitignore | 2 | ||||
-rw-r--r-- | gvdb/Makefile.am | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gvdb/.gitignore b/gvdb/.gitignore new file mode 100644 index 0000000..8b5dee6 --- /dev/null +++ b/gvdb/.gitignore @@ -0,0 +1,2 @@ +libgvdb.a +libgvdb-shared.a diff --git a/gvdb/Makefile.am b/gvdb/Makefile.am index 0fe3bb0..24aaf1e 100644 --- a/gvdb/Makefile.am +++ b/gvdb/Makefile.am @@ -1,8 +1,14 @@ include $(top_srcdir)/Makefile.gtester -EXTRA_DIST = \ +noinst_LIBRARIES = libgvdb.a libgvdb-shared.a + +libgvdb_a_CFLAGS = $(glib_CFLAGS) +libgvdb_a_SOURCES = \ gvdb-format.h \ - gvdb-reader.h \ - gvdb-reader.c \ gvdb-builder.h \ - gvdb-builder.c + gvdb-builder.c \ + gvdb-reader.h \ + gvdb-reader.c + +libgvdb_shared_a_CFLAGS = $(libgvdb_a_CFLAGS) -fPIC -DPIC +libgvdb_shared_a_SOURCES = $(libgvdb_a_SOURCES) |