[dconf] Get rid of libtool

[Ryan Lortie <ryanl src gnome org>]

commit 2992fc3d0aee195d8fda600ca0468c6ee91d4f4e
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jul 22 16:58:55 2010 -0400

    Get rid of libtool
    
    You need to type 'make clean' before trying to rebuild dconf after this
    update (in fact, 'git clean' may be appropriate to clean out all the
    extra files that libtool leaves around).
    
    It's quite likely that this completely breaks dconf builds on non-ELF
    platforms (and maybe some ELF ones).  Please report any problems to
    bugzilla.  I'm very happy to accept patches to fix portability (via
    ./configure-time checks).

 .gitignore            |    3 ---
 autogen.sh            |    3 +--
 bin/Makefile.am       |    2 +-
 client/.gitignore     |    2 ++
 client/Makefile.am    |   21 +++++++++++++--------
 configure.ac          |    4 ----
 docs/Makefile.am      |    2 +-
 editor/Makefile.am    |    2 +-
 gsettings/.gitignore  |    1 +
 gsettings/Makefile.am |   10 +++++-----
 10 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b2a7b3..61c84d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
 # for all subdirectories
 Makefile.in
 Makefile
-.libs
 .deps
 *.o
-*.lo
-*.la
 *.pc
 *.gir
 *.typelib
diff --git a/autogen.sh b/autogen.sh
index 08d6b97..c0f3bc8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,9 +14,8 @@ else
   automake=automake
 fi
 
-mkdir -p m4
+mkdir -p m4 aux
 gtkdocize --docdir docs --flavour no-tmpl
-libtoolize --automake
 aclocal ${ACLOCAL_FLAGS}
 ${automake} --add-missing --foreign
 autoconf
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 8559f7c..3d5c82d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -4,5 +4,5 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/engine -I$(top_srcdir)/client
 bin_PROGRAMS = dconf
 
 dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
-dconf_LDADD = $(gio_LIBS) ../client/libdconf.la
+dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
 dconf_SOURCES = dconf.vala dconf-update.vala ../gvdb/gvdb-builder.c gvdb.vapi fixes.vapi
diff --git a/client/.gitignore b/client/.gitignore
index 522859e..241653e 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -2,3 +2,5 @@ dconf.vapi
 *.c
 *.stamp
 *.deps
+libdconf.so
+libdconf.so.0
diff --git a/client/Makefile.am b/client/Makefile.am
index da555b6..354a87c 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,10 +1,10 @@
 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
 
-dconf-0.3.gir: libdconf.la
+dconf-0.3.gir: libdconf.so
 dconf_0_3_gir_INCLUDES = Gio-2.0
 dconf_0_3_gir_CFLAGS = $(INCLUDES)
-dconf_0_3_gir_LIBS = libdconf.la
+dconf_0_3_gir_LIBS = dconf
 dconf_0_3_gir_FILES = dconf-client.c dconf-client.h
 INTROSPECTION_GIRS = dconf-0.3.gir
 
@@ -15,26 +15,31 @@ typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 endif
 
-AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__
+AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__ -fPIC -DPIC
 INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
 
-lib_LTLIBRARIES = libdconf.la
+shlibdir=$(libdir)
+shlib_PROGRAMS = libdconf.so.0
+shlib_DATA = libdconf.so
+
+libdconf.so: libdconf.so.0
+	ln -fs libdconf.so.0 libdconf.so
 
 dconfinclude_HEADERS = \
 	dconf-client.h	\
 	dconf.h
 
-libdconf_la_LIBADD = $(gio_LIBS)
-libdconf_la_SOURCES = \
+libdconf_so_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 $(gio_LIBS)
+libdconf_so_0_SOURCES = \
 	../common/dconf-shmdir.c	\
 	../common/dconf-paths.c		\
 	../engine/dconf-engine.c	\
 	../gvdb/gvdb-reader.c		\
 	dconf-client.vala engine.vapi
-libdconf_la_VALAFLAGS = --library dconf --pkg=gio-2.0
+libdconf_so_0_VALAFLAGS = --library dconf --pkg=gio-2.0
 
 EXTRA_DIST = dconf.vapi
-dconf.vapi: libdconf.la
+dconf.vapi: libdconf.so.0
 
 dconf.deps:
 	echo gio-2.0 > dconf.deps
diff --git a/configure.ac b/configure.ac
index 30510b1..f4c80b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,10 +14,6 @@ AM_SILENT_RULES([yes])
 AC_PROG_CC
 AM_PROG_VALAC([0.9.2])
 
-# Initialise libtool
-LT_PREREQ([2.2])
-LT_INIT
-
 # Introspection
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0b5b91e..6b29de5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,7 +9,7 @@ DOC_SOURCE_DIR = ..
 MKDB_OPTIONS = --output-format=xml
 
 INCLUDES = $(gio_CFLAGS)
-GTKDOC_LIBS = $(gio_LIBS) ../client/libdconf.la
+GTKDOC_LIBS = $(gio_LIBS) ../client/libdconf.so
 
 IGNORE_HFILES = \
 	dconf-engine.h		\
diff --git a/editor/Makefile.am b/editor/Makefile.am
index 7e29429..3a0e744 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -2,5 +2,5 @@ bin_PROGRAMS = dconf-editor
 
 AM_CFLAGS = $(gtk_CFLAGS) $(gee_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client
 AM_VALAFLAGS = --vapidir ../client --pkg gee-1.0 --pkg gtk+-2.0 --pkg libxml-2.0 --pkg dconf
-dconf_editor_LDADD = ../client/libdconf.la $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
+dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
 dconf_editor_SOURCES = dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
diff --git a/gsettings/.gitignore b/gsettings/.gitignore
new file mode 100644
index 0000000..621458d
--- /dev/null
+++ b/gsettings/.gitignore
@@ -0,0 +1 @@
+libdconfsettings.so
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index 9acf7e7..e4f0c49 100644
--- a/gsettings/Makefile.am
+++ b/gsettings/Makefile.am
@@ -1,11 +1,11 @@
-AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings
+AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC
 INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
 
-giomodules_LTLIBRARIES = libdconfsettings.la
+giomodules_PROGRAMS = libdconfsettings.so
 
-libdconfsettings_la_LIBADD = $(gio_LIBS)
-libdconfsettings_la_LDFLAGS = -module -avoid-version -shared
-libdconfsettings_la_SOURCES = \
+libdconfsettings_so_LDADD = $(gio_LIBS)
+libdconfsettings_so_LDFLAGS = -module -avoid-version -shared
+libdconfsettings_so_SOURCES = \
 	../engine/dconf-engine.c	\
 	../common/dconf-shmdir.c	\
 	../gvdb/gvdb-reader.c		\