From: Philip Withnall Date: Tue, 2 Aug 2011 22:04:58 +0000 (+0100) Subject: Bug 649296 — Folks backend files shouldn't begin with "lib" X-Git-Tag: FOLKS_0_6_0~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca19d32918f94dc4280a3d7a28680f8fecb41cc5;p=platform%2Fupstream%2Ffolks.git Bug 649296 — Folks backend files shouldn't begin with "lib" Rename the backend library files from “libfolks-backend-${BACKEND_NAME}.so” to “${BACKEND_NAME}.so”. Closes: bgo#649296 --- diff --git a/NEWS b/NEWS index 95084db..85c202e 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ Bugs fixed: * Bug 655510 — Make truly-writeable *Details property setters public * Bug 654907 — The writable store shouldn't be set by type_id * Bug 655745 — Implement read/write support for gender property +* Bug 649296 — Folks backend files shouldn't begin with "lib" API changes: * Swf.Persona retains and exposes its libsocialweb Contact diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am index f788a93..7d53c70 100644 --- a/backends/eds/Makefile.am +++ b/backends/eds/Makefile.am @@ -16,18 +16,18 @@ VALAFLAGS += \ --vapidir=. \ --vapidir=$(top_builddir)/backends/eds/lib \ --vapidir=$(top_srcdir)/folks \ - $(addprefix --pkg ,$(folks_backend_eds_deps)) \ + $(addprefix --pkg ,$(eds_deps)) \ $(NULL) backenddir = $(BACKEND_DIR)/eds -backend_LTLIBRARIES = libfolks-backend-eds.la +backend_LTLIBRARIES = eds.la -libfolks_backend_eds_la_SOURCES = \ +eds_la_SOURCES = \ eds-backend.vala \ eds-backend-factory.vala \ $(NULL) -folks_backend_eds_deps = \ +eds_deps = \ folks \ folks-eds \ gee-1.0 \ @@ -38,7 +38,7 @@ folks_backend_eds_deps = \ libxml-2.0 \ $(NULL) -libfolks_backend_eds_la_CFLAGS = \ +eds_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -47,7 +47,7 @@ libfolks_backend_eds_la_CFLAGS = \ $(LIBXML_CFLAGS) \ $(NULL) -libfolks_backend_eds_la_LIBADD = \ +eds_la_LIBADD = \ lib/libfolks-eds.la \ $(top_builddir)/folks/libfolks.la \ $(GIO_LIBS) \ @@ -58,12 +58,12 @@ libfolks_backend_eds_la_LIBADD = \ $(LIBXML_LIBS) \ $(NULL) -libfolks_backend_eds_la_LDFLAGS = -shared -fPIC -module -avoid-version +eds_la_LDFLAGS = -shared -fPIC -module -avoid-version GITIGNOREFILES = \ folks-backend-eds.vapi \ - $(libfolks_backend_eds_la_SOURCES:.vala=.c) \ - libfolks_backend_eds_la_vala.stamp \ + $(eds_la_SOURCES:.vala=.c) \ + eds_la_vala.stamp \ $(NULL) -include backend.mk diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am index b6e3370..193c47a 100644 --- a/backends/key-file/Makefile.am +++ b/backends/key-file/Makefile.am @@ -9,16 +9,16 @@ AM_CPPFLAGS = \ $(NULL) backenddir = $(BACKEND_DIR)/key-file -backend_LTLIBRARIES = libfolks-backend-key-file.la +backend_LTLIBRARIES = key-file.la -libfolks_backend_key_file_la_SOURCES = \ +key_file_la_SOURCES = \ kf-backend.vala \ kf-backend-factory.vala \ kf-persona.vala \ kf-persona-store.vala \ $(NULL) -libfolks_backend_key_file_la_VALAFLAGS = \ +key_file_la_VALAFLAGS = \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -28,25 +28,25 @@ libfolks_backend_key_file_la_VALAFLAGS = \ --pkg gobject-2.0 \ $(NULL) -libfolks_backend_key_file_la_CFLAGS = \ +key_file_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) -libfolks_backend_key_file_la_LIBADD = \ +key_file_la_LIBADD = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(NULL) -libfolks_backend_key_file_la_LDFLAGS = -shared -fPIC -module -avoid-version +key_file_la_LDFLAGS = -shared -fPIC -module -avoid-version GITIGNOREFILES = \ folks-backend-key-file.vapi \ - $(libfolks_backend_key_file_la_SOURCES:.vala=.c) \ - libfolks_backend_key_file_la_vala.stamp \ + $(key_file_la_SOURCES:.vala=.c) \ + key_file_la_vala.stamp \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am index a611974..b578e9f 100644 --- a/backends/libsocialweb/Makefile.am +++ b/backends/libsocialweb/Makefile.am @@ -16,18 +16,18 @@ VALAFLAGS += \ --vapidir=. \ --vapidir=$(top_builddir)/backends/libsocialweb/lib \ --vapidir=$(top_srcdir)/folks \ - $(addprefix --pkg ,$(folks_backend_libsocialweb_deps)) \ + $(addprefix --pkg ,$(libsocialweb_deps)) \ $(NULL) backenddir = $(BACKEND_DIR)/libsocialweb -backend_LTLIBRARIES = libfolks-backend-libsocialweb.la +backend_LTLIBRARIES = libsocialweb.la -libfolks_backend_libsocialweb_la_SOURCES = \ +libsocialweb_la_SOURCES = \ sw-backend.vala \ sw-backend-factory.vala \ $(NULL) -folks_backend_libsocialweb_deps = \ +libsocialweb_deps = \ folks \ folks-libsocialweb \ gee-1.0 \ @@ -36,14 +36,14 @@ folks_backend_libsocialweb_deps = \ libsocialweb-client \ $(NULL) -libfolks_backend_libsocialweb_la_CFLAGS = \ +libsocialweb_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(SW_CLIENT_CFLAGS) \ $(NULL) -libfolks_backend_libsocialweb_la_LIBADD = \ +libsocialweb_la_LIBADD = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -52,12 +52,12 @@ libfolks_backend_libsocialweb_la_LIBADD = \ lib/libfolks-libsocialweb.la \ $(NULL) -libfolks_backend_libsocialweb_la_LDFLAGS = -shared -fPIC -module -avoid-version +libsocialweb_la_LDFLAGS = -shared -fPIC -module -avoid-version GITIGNOREFILES = \ folks-backend-libsocialweb.vapi \ - $(libfolks_backend_libsocialweb_la_SOURCES:.vala=.c) \ - libfolks_backend_libsocialweb_la_vala.stamp \ + $(libsocialweb_la_SOURCES:.vala=.c) \ + libsocialweb_la_vala.stamp \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am index 93c2f52..d54c8c5 100644 --- a/backends/telepathy/Makefile.am +++ b/backends/telepathy/Makefile.am @@ -16,18 +16,18 @@ VALAFLAGS += \ --vapidir=. \ --vapidir=$(top_builddir)/backends/telepathy/lib \ --vapidir=$(top_srcdir)/folks \ - $(addprefix --pkg ,$(folks_backend_telepathy_deps)) \ + $(addprefix --pkg ,$(telepathy_deps)) \ $(NULL) backenddir = $(BACKEND_DIR)/telepathy -backend_LTLIBRARIES = libfolks-backend-telepathy.la +backend_LTLIBRARIES = telepathy.la -libfolks_backend_telepathy_la_SOURCES = \ +telepathy_la_SOURCES = \ tp-backend.vala \ tp-backend-factory.vala \ $(NULL) -folks_backend_telepathy_deps = \ +telepathy_deps = \ folks \ folks-telepathy \ gee-1.0 \ @@ -36,14 +36,14 @@ folks_backend_telepathy_deps = \ telepathy-glib \ $(NULL) -libfolks_backend_telepathy_la_CFLAGS = \ +telepathy_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TP_GLIB_CFLAGS) \ $(NULL) -libfolks_backend_telepathy_la_LIBADD = \ +telepathy_la_LIBADD = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -52,12 +52,12 @@ libfolks_backend_telepathy_la_LIBADD = \ lib/libfolks-telepathy.la \ $(NULL) -libfolks_backend_telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version +telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version GITIGNOREFILES = \ folks-backend-telepathy.vapi \ - $(libfolks_backend_telepathy_la_SOURCES:.vala=.c) \ - libfolks_backend_telepathy_la_vala.stamp \ + $(telepathy_la_SOURCES:.vala=.c) \ + telepathy_la_vala.stamp \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am index f78316a..eb7aa67 100644 --- a/backends/tracker/Makefile.am +++ b/backends/tracker/Makefile.am @@ -17,18 +17,18 @@ VALAFLAGS += \ --vapidir=vapi \ --vapidir=$(top_builddir)/backends/tracker/lib \ --vapidir=$(top_srcdir)/folks \ - $(addprefix --pkg ,$(folks_backend_tracker_deps)) \ + $(addprefix --pkg ,$(tracker_deps)) \ $(NULL) backenddir = $(BACKEND_DIR)/tracker -backend_LTLIBRARIES = libfolks-backend-tracker.la +backend_LTLIBRARIES = tracker.la -libfolks_backend_tracker_la_SOURCES = \ +tracker_la_SOURCES = \ tr-backend.vala \ tr-backend-factory.vala \ $(NULL) -folks_backend_tracker_deps = \ +tracker_deps = \ folks \ folks-tracker \ gee-1.0 \ @@ -37,14 +37,14 @@ folks_backend_tracker_deps = \ tracker-sparql-0.10 \ $(NULL) -libfolks_backend_tracker_la_CFLAGS = \ +tracker_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TRACKER_SPARQL_CFLAGS) \ $(NULL) -libfolks_backend_tracker_la_LIBADD = \ +tracker_la_LIBADD = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -53,12 +53,12 @@ libfolks_backend_tracker_la_LIBADD = \ lib/libfolks-tracker.la \ $(NULL) -libfolks_backend_tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version +tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version GITIGNOREFILES = \ folks-backend-tracker.vapi \ - $(libfolks_backend_tracker_la_SOURCES:.vala=.c) \ - libfolks_backend_tracker_la_vala.stamp \ + $(tracker_la_SOURCES:.vala=.c) \ + tracker_la_vala.stamp \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac index ebfd01f..9c12045 100644 --- a/configure.ac +++ b/configure.ac @@ -258,25 +258,25 @@ AC_DEFINE([MODULE_VERSION], "folks_module_version", [Module interface version]) BACKEND_DIR='$(libdir)/folks/$(FOLKS_MODULE_VERSION)/backends' AC_SUBST([BACKEND_DIR]) -BACKEND_KF='$(top_builddir)/backends/key-file/.libs/libfolks-backend-key-file.so' +BACKEND_KF='$(top_builddir)/backends/key-file/.libs/key-file.so' AC_SUBST([BACKEND_KF]) -BACKEND_TP='$(top_builddir)/backends/telepathy/.libs/libfolks-backend-telepathy.so' +BACKEND_TP='$(top_builddir)/backends/telepathy/.libs/telepathy.so' AC_SUBST([BACKEND_TP]) -BACKEND_EDS='$(top_builddir)/backends/eds/.libs/libfolks-backend-eds.so' +BACKEND_EDS='$(top_builddir)/backends/eds/.libs/eds.so' AC_SUBST([BACKEND_EDS]) if test x$have_libsocialweb_backend = xyes; then - BACKEND_LIBSOCIALWEB='$(top_builddir)/backends/libsocialweb/.libs/libfolks-backend-libsocialweb.so' + BACKEND_LIBSOCIALWEB='$(top_builddir)/backends/libsocialweb/.libs/libsocialweb.so' AC_SUBST([BACKEND_LIBSOCIALWEB]) fi if test x$enable_tracker_backend = xyes; then - BACKEND_TRACKER='$(top_builddir)/backends/tracker/.libs/libfolks-backend-tracker.so' + BACKEND_TRACKER='$(top_builddir)/backends/tracker/.libs/tracker.so' AC_SUBST([BACKEND_TRACKER]) fi if test x$enable_eds_backend = xyes; then - BACKEND_EDS='$(top_builddir)/backends/eds/.libs/libfolks-backend-eds.so' + BACKEND_EDS='$(top_builddir)/backends/eds/.libs/eds.so' AC_SUBST([BACKEND_EDS]) fi