diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-30 11:15:03 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-01 15:45:21 +0200 |
commit | 33494a06b684ef84ab913de50fed9f713d42d415 (patch) | |
tree | 60fee8d4c02741d01b777d6efe75342273b42755 | |
parent | 51f72228e4ef4fda0475dc3af52caad1cb320842 (diff) | |
download | telepathy-logger-33494a06b684ef84ab913de50fed9f713d42d415.tar.gz |
prefix lib file with -1
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | doc/reference/libtelepathy-logger/Makefile.am | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | telepathy-logger/Makefile.am | 16 | ||||
-rw-r--r-- | telepathy-logger/abi.am | 4 | ||||
-rw-r--r-- | telepathy-logger/telepathy-logger-0.2-uninstalled.pc.in | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/dbus/Makefile.am | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index f3af649..b7a6e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -8,12 +8,12 @@ m4_define([tpl_nano_version], [1]) # increment current and set revision to 0 # If interfaces have been added since last release, increment age # If interfaces have been removed since last release, set age to 0 -m4_define([tpl_lt_current], [6]) +m4_define([tpl_lt_current], [0]) m4_define([tpl_lt_revision], [0]) -m4_define([tpl_lt_age], [3]) +m4_define([tpl_lt_age], [0]) # The same for the extensions library produced by --enable-public-extensions -m4_define([tpl_ext_lt_current], [3]) +m4_define([tpl_ext_lt_current], [0]) m4_define([tpl_ext_lt_revision], [0]) m4_define([tpl_ext_lt_age], [0]) diff --git a/doc/reference/libtelepathy-logger/Makefile.am b/doc/reference/libtelepathy-logger/Makefile.am index e9380b7..a279726 100644 --- a/doc/reference/libtelepathy-logger/Makefile.am +++ b/doc/reference/libtelepathy-logger/Makefile.am @@ -105,7 +105,7 @@ INCLUDES= \ $(TPL_CFLAGS) GTKDOC_LIBS= \ $(TPL_LIBS) \ - $(top_builddir)/telepathy-logger/libtelepathy-logger.la + $(top_builddir)/telepathy-logger/libtelepathy-logger-1.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/src/Makefile.am b/src/Makefile.am index 61b2051..a39c38b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,7 @@ libexec_PROGRAMS = \ telepathy-logger telepathy_logger_LDADD = \ - $(top_builddir)/telepathy-logger/libtelepathy-logger.la \ + $(top_builddir)/telepathy-logger/libtelepathy-logger-1.la \ $(TPL_LIBS) check_c_sources = \ diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am index bc1f55a..c4e1abc 100644 --- a/telepathy-logger/Makefile.am +++ b/telepathy-logger/Makefile.am @@ -22,7 +22,7 @@ AM_CPPFLAGS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = telepathy-logger-0.2.pc -lib_LTLIBRARIES = libtelepathy-logger.la +lib_LTLIBRARIES = libtelepathy-logger-1.la EXTRA_DIST = \ tpl-marshal.list \ @@ -50,7 +50,7 @@ BUILT_SOURCES = \ tpl-marshal.c tpl-marshal.h \ $(NULL) -libtelepathy_logger_la_SOURCES = \ +libtelepathy_logger_1_la_SOURCES = \ action-chain.c \ action-chain-internal.h \ call-event.c \ @@ -101,14 +101,14 @@ libtelepathy_logger_la_SOURCES = \ call-channel-internal.h \ $(NULL) -nodist_libtelepathy_logger_la_SOURCES = \ +nodist_libtelepathy_logger_1_la_SOURCES = \ $(BUILT_SOURCES) -libtelepathy_logger_la_LIBADD = \ +libtelepathy_logger_1_la_LIBADD = \ $(top_builddir)/extensions/libtpl-extensions-convenience.la check_c_sources = \ - $(libtelepathy_logger_la_SOURCES) \ + $(libtelepathy_logger_1_la_SOURCES) \ $(LIBTPL_HEADERS) include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style @@ -116,13 +116,13 @@ check-local: check-coding-style CLEANFILES = $(BUILT_SOURCES) if HAVE_INTROSPECTION -introspection_sources = $(libtelepathy_logger_la_SOURCES) $(LIBTPL_HEADERS) +introspection_sources = $(libtelepathy_logger_1_la_SOURCES) $(LIBTPL_HEADERS) -TelepathyLogger-0.2.gir: libtelepathy-logger.la +TelepathyLogger-0.2.gir: libtelepathy-logger-1.la TelepathyLogger_0_2_gir_SCANNERFLAGS = --identifier-prefix=Tpl --warn-all TelepathyLogger_0_2_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12 TelepathyLogger_0_2_gir_CFLAGS = $(INCLUDES) -TelepathyLogger_0_2_gir_LIBS = libtelepathy-logger.la +TelepathyLogger_0_2_gir_LIBS = libtelepathy-logger-1.la TelepathyLogger_0_2_gir_FILES = $(filter-out %-internal.h, $(introspection_sources)) INTROSPECTION_GIRS += TelepathyLogger-0.2.gir diff --git a/telepathy-logger/abi.am b/telepathy-logger/abi.am index ca1bcb7..d63e847 100644 --- a/telepathy-logger/abi.am +++ b/telepathy-logger/abi.am @@ -3,10 +3,10 @@ # The quoting here is unnecessary but harmless, and has the useful side-effect # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file -libtelepathy_logger_la_LDFLAGS = \ +libtelepathy_logger_1_la_LDFLAGS = \ -version-info "$(TPL_LT_CURRENT)":"$(TPL_LT_REVISION)":"$(TPL_LT_AGE)" -_gen/abi.txt: libtelepathy-logger.la abi.am +_gen/abi.txt: libtelepathy-logger-1.la abi.am $(NM) .libs/libtelepathy-logger.a > _gen/abi.nm grep " [DT] " < _gen/abi.nm > _gen/abi.funcs cut -d" " -f3 < _gen/abi.funcs > _gen/abi.funcnames diff --git a/telepathy-logger/telepathy-logger-0.2-uninstalled.pc.in b/telepathy-logger/telepathy-logger-0.2-uninstalled.pc.in index ead16cb..2f993fd 100644 --- a/telepathy-logger/telepathy-logger-0.2-uninstalled.pc.in +++ b/telepathy-logger/telepathy-logger-0.2-uninstalled.pc.in @@ -7,5 +7,5 @@ Name: Telepathy Logger library (uninstalled copy) Description: Access to Telepathy logs Requires: telepathy-glib-1 telepathy-glib-1-dbus libxml-2.0 Version: @VERSION@ -Libs: ${abs_top_builddir}/telepathy-logger/libtelepathy-logger.la +Libs: ${abs_top_builddir}/telepathy-logger/libtelepathy-logger-1.la Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} diff --git a/tests/Makefile.am b/tests/Makefile.am index 436758b..09a4989 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,7 @@ noinst_PROGRAMS = \ TESTS = $(noinst_PROGRAMS) LDADD = \ - $(top_builddir)/telepathy-logger/libtelepathy-logger.la \ + $(top_builddir)/telepathy-logger/libtelepathy-logger-1.la \ $(TPL_LIBS) AM_CFLAGS = \ diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am index f0540cf..36c39d0 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -14,7 +14,7 @@ TESTS = $(noinst_PROGRAMS) LDADD = \ $(top_builddir)/tests/lib/libtp-logger-tests.la \ - $(top_builddir)/telepathy-logger/libtelepathy-logger.la \ + $(top_builddir)/telepathy-logger/libtelepathy-logger-1.la \ $(TPL_LIBS) \ $(NULL) |