diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-07-22 16:58:55 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-07-24 10:24:05 -0400 |
| commit | 2992fc3d0aee195d8fda600ca0468c6ee91d4f4e (patch) | |
| tree | cd23ab8e103a26efd4c94132ccbe49f5f86ed735 /client | |
| parent | 13e610927e0b2b13ecb1cdb63e4e6441b226dffa (diff) | |
| download | dconf-2992fc3d0aee195d8fda600ca0468c6ee91d4f4e.tar.gz | |
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).
Diffstat (limited to 'client')
| -rw-r--r-- | client/.gitignore | 2 | ||||
| -rw-r--r-- | client/Makefile.am | 21 |
2 files changed, 15 insertions, 8 deletions
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 |