On Wed, 2012-01-25 at 10:05 +0000, Patrick Ohly wrote: > Is there a good reason for installing some libraries in a > > sub-directory. Simplifying that might let use remove some hacks from > the > > build files. > > I've wondered about that myself recently. In the end I settled on > adding > some hacks instead of moving the libs, mostly just because it was the > smaller change. > > The original motivation was to avoid file clashes with other packages > also providing libgdbus.so. That alone wasn't enough, because later > symbols in that lib clashed with similarly named symbols in glib, so > the > lib and all symbols were renamed. > > I don't think there still is any reason to install normal libraries in > usr/lib/libsyncevolution. It should be used only for modules which get > dlopened(). Want to provide a patch?
Sorry for the delay. Here it is. It's very simple. This might also make the whole install-am override/hack unnecessary, but let's be cautious. > -- Murray Cumming [email protected] www.murrayc.com www.openismus.com
>From f39c036c3a8ffca3f44ab071818d0d0938f8c30c Mon Sep 17 00:00:00 2001 From: Murray Cumming <[email protected]> Date: Mon, 13 Feb 2012 13:41:03 +0100 Subject: [PATCH] Do not install libgdbussyncevo in a subdir --- Makefile.am | 1 - src/gdbus/gdbus.am | 4 +--- src/gdbusxx/gdbusxx.am | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c62df46..ff308a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -303,7 +303,6 @@ dist-hook: $(all_dist_hooks) # during concurrent distcheck (a backend was relinked against not yet installed # libsyncevolution.la). install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-pkglibLTLIBRARIES @$(MAKE) $(AM_MAKEFLAGS) install-exec-am @$(MAKE) $(AM_MAKEFLAGS) install-data-am diff --git a/src/gdbus/gdbus.am b/src/gdbus/gdbus.am index 11cc036..2c50074 100644 --- a/src/gdbus/gdbus.am +++ b/src/gdbus/gdbus.am @@ -4,9 +4,7 @@ dist_noinst_DATA += \ src/gdbus/README if ENABLE_MODULES -# pkglibdir is defined to $(libdir)/$(PACKAGE). see: -# http://www.gnu.org/software/automake/manual/automake.html#Uniform -pkglib_LTLIBRARIES = src/gdbus/libgdbussyncevo.la +lib_LTLIBRARIES += src/gdbus/libgdbussyncevo.la src_gdbus_version_info = -version-info 0:0:0 else noinst_LTLIBRARIES += src/gdbus/libgdbussyncevo.la diff --git a/src/gdbusxx/gdbusxx.am b/src/gdbusxx/gdbusxx.am index 8f9bfd9..bd93406 100644 --- a/src/gdbusxx/gdbusxx.am +++ b/src/gdbusxx/gdbusxx.am @@ -1,5 +1,5 @@ if ENABLE_MODULES -pkglib_LTLIBRARIES = src/gdbusxx/libgdbussyncevo.la +lib_LTLIBRARIES += src/gdbusxx/libgdbussyncevo.la src_gdbusxx_version_info = -version-info 0:0:0 else noinst_LTLIBRARIES += src/gdbusxx/libgdbussyncevo.la -- 1.7.5.4
_______________________________________________ SyncEvolution mailing list [email protected] http://lists.syncevolution.org/listinfo/syncevolution
