[dconf/wip/reorg: 459/523] common/: create two convenience libraries

[Ryan Lortie <ryanl src gnome org>]

commit e054942e30f18b4d0a1776838cf08082610620b3
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Jul 1 12:52:22 2012 -0400

    common/: create two convenience libraries
    
    One -fPIC and one without.
    
    This is done instead of pulling the various source files from other
    Makefiles.

 Makefile.am           |    2 +-
 client/Makefile.am    |    4 +---
 common/Makefile.am    |   15 +++++++++++----
 configure.ac          |    1 +
 dbus-1/Makefile.am    |    3 +--
 gsettings/Makefile.am |    3 +--
 service/Makefile.am   |    3 +--
 tests/Makefile.am     |    6 ++----
 8 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6f23b0a..6fb0701 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = gvdb service gsettings dbus-1 tests client bin engine common docs
+SUBDIRS = gvdb common service gsettings dbus-1 tests client bin engine docs
 
 if ENABLE_EDITOR
 SUBDIRS += editor
diff --git a/client/Makefile.am b/client/Makefile.am
index b53163e..daebad3 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -21,11 +21,9 @@ dconfinclude_HEADERS = \
 	dconf-client.h	\
 	dconf.h
 
-libdconf_so_0_0_0_LDADD = $(gio_LIBS)
+libdconf_so_0_0_0_LDADD = $(gio_LIBS) ../common/libdconf-common-shared.a
 libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0
 libdconf_so_0_0_0_SOURCES = \
-	../common/dconf-shmdir.c	\
-	../common/dconf-paths.c		\
 	../engine/dconf-engine.c	\
 	../gvdb/gvdb-reader.c		\
 	dconf-client.vala engine.vapi
diff --git a/common/Makefile.am b/common/Makefile.am
index 0238cd1..250bb91 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,7 +1,14 @@
 dconfinclude_HEADERS = \
 	dconf-paths.h
 
-EXTRA_DIST = \
-	dconf-shmdir.h	\
-	dconf-paths.h	\
-	dconf-paths.c
+noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a
+libdconf_common_a_CFLAGS = -Wall
+INCLUDES = $(glib_CFLAGS)
+
+libdconf_common_a_SOURCES = \
+	dconf-paths.c		\
+	dconf-shmdir.h		\
+	dconf-shmdir.c
+
+libdconf_common_shared_a_CFLAGS = -fPIC -DPIC $(libdconf_common_a_CFLAGS)
+libdconf_common_shared_a_SOURCES = $(libdconf_common_a_SOURCES)
diff --git a/configure.ac b/configure.ac
index d77a5c7..48fb843 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AM_SILENT_RULES([yes])
 
 # Check for programs
 AC_PROG_CC
+AC_PROG_RANLIB
 AM_PROG_VALAC([0.15.1])
 
 # Use GSettings
diff --git a/dbus-1/Makefile.am b/dbus-1/Makefile.am
index 6e740f1..1417ff4 100644
--- a/dbus-1/Makefile.am
+++ b/dbus-1/Makefile.am
@@ -10,11 +10,10 @@ pkgconfig_DATA = dconf-dbus-1.pc
 shlibdir = $(libdir)
 shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
 
-libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS)
+libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS) ../common/libdconf-common-shared.a
 libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
 libdconf_dbus_1_so_0_0_0_SOURCES = \
 	../engine/dconf-engine.c	\
-	../common/dconf-shmdir.c	\
 	../gvdb/gvdb-reader.c		\
 	dconf-dbus-1.c
 
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index ace7da0..e35926e 100644
--- a/gsettings/Makefile.am
+++ b/gsettings/Makefile.am
@@ -3,11 +3,10 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(
 
 giomodules_PROGRAMS = libdconfsettings.so
 
-libdconfsettings_so_LDADD = $(gio_LIBS)
+libdconfsettings_so_LDADD = $(gio_LIBS) ../common/libdconf-common-shared.a
 libdconfsettings_so_LDFLAGS = -shared
 libdconfsettings_so_SOURCES = \
 	../engine/dconf-engine.c	\
-	../common/dconf-shmdir.c	\
 	../gvdb/gvdb-reader.c		\
 	dconfcontext.h			\
 	dconfcontext.c			\
diff --git a/service/Makefile.am b/service/Makefile.am
index d3eddf7..15e0937 100644
--- a/service/Makefile.am
+++ b/service/Makefile.am
@@ -4,11 +4,10 @@ libexec_PROGRAMS = dconf-service
 
 dbusservice_DATA = ca.desrt.dconf.service
 
-dconf_service_LDADD = $(gio_LIBS)
+dconf_service_LDADD = $(gio_LIBS) ../common/libdconf-common.a
 dconf_service_SOURCES = \
 	../gvdb/gvdb-builder.c		\
 	../gvdb/gvdb-reader.c		\
-	../common/dconf-shmdir.c	\
 	dconf-interfaces.h		\
 	dconf-interfaces.c		\
 	dconf-rebuilder.h		\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3b66beb..e6cfab1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,5 @@ noinst_PROGRAMS = paths gsettings dbus1
 
 gsettings_LDADD = $(gio_LIBS)
 dbus1_LDADD = -L../dbus-1 -ldconf-dbus-1 $(glib_LIBS)
-paths_LDADD = $(gio_LIBS)
-paths_SOURCES = \
-	../common/dconf-paths.c		\
-	paths.c
+paths_LDADD = $(gio_LIBS) ../common/libdconf-common.a
+paths_SOURCES = paths.c