Attachment 96289 Details for Bug 76462 – logger, tpfs: distribute ABI lists, and clean up generated files

[patch] logger, tpfs: distribute ABI lists, and clean up generated files

0001-logger-tpfs-distribute-ABI-lists-and-clean-up-genera.patch (text/plain), 2.29 KB, created by Simon McVittie on 2014-03-24 13:21:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-03-24 13:21:47 UTC

Size: 2.29 KB

patch

obsolete

>From 2690c1d1f0e7a2a86f313fc7f0d6a9e346c77326 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 24 Mar 2014 13:16:39 +0000
>Subject: [PATCH] logger, tpfs: distribute ABI lists, and clean up generated
> files
>
>---
> telepathy-farstream/Makefile.am | 16 +++++++++++++++-
> telepathy-logger/Makefile.am    |  1 +
> telepathy-logger/abi.am         | 12 ++++++++++++
> 3 files changed, 28 insertions(+), 1 deletion(-)
>
>diff --git a/telepathy-farstream/Makefile.am b/telepathy-farstream/Makefile.am
>index abe4e33..ce104aa 100644
>--- a/telepathy-farstream/Makefile.am
>+++ b/telepathy-farstream/Makefile.am
>@@ -91,6 +91,20 @@ ABI_LISTS = \
> 	1.0.abi \
> 	$(NULL)
> 
>+EXTRA_DIST = $(ABI_LISTS)
>+
>+CLEANFILES = \
>+	_gen/abi.funcnames \
>+	_gen/abi.funcs \
>+	_gen/abi.nm \
>+	_gen/abi.tpfuncnames \
>+	_gen/abi.txt \
>+	_gen/version-script.txt \
>+	_gen/libtelepathy-farstream-1-0.symbols \
>+	_gen/versioned-abi.tmp \
>+	_gen/versioned-abi.txt \
>+	$(NULL)
>+
> _gen/abi.txt: libtelepathy-farstream-internal.la Makefile.am
> 	$(MKDIR_P) _gen
> 	$(NM) .libs/libtelepathy-farstream-internal.a > _gen/abi.nm
>@@ -177,7 +191,7 @@ gir_DATA = $(INTROSPECTION_GIRS)
> typelibdir = $(libdir)/girepository-1.0
> typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
> 
>-CLEANFILES = $(gir_DATA) $(typelib_DATA)
>+CLEANFILES += $(gir_DATA) $(typelib_DATA)
> endif
> 
> SUBDIRS = . examples
>diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
>index 7d55e72..6237418 100644
>--- a/telepathy-logger/Makefile.am
>+++ b/telepathy-logger/Makefile.am
>@@ -46,6 +46,7 @@ noinst_LTLIBRARIES = libtelepathy-logger-internal.la
> 
> EXTRA_DIST = \
> 	tpl-marshal.list \
>+	$(ABI_LISTS) \
> 	$(NULL)
> 
> LIBTPLdir = $(includedir)/telepathy-logger-1/telepathy-logger
>diff --git a/telepathy-logger/abi.am b/telepathy-logger/abi.am
>index 7a65543..4926b84 100644
>--- a/telepathy-logger/abi.am
>+++ b/telepathy-logger/abi.am
>@@ -79,4 +79,16 @@ _gen/version-script.txt: \
> 	: # the versioned API should always match the ^tp API
> 	diff -c _gen/versioned-abi.txt _gen/abi.txt
> 
>+CLEANFILES += \
>+	_gen/abi.funcnames \
>+	_gen/abi.funcs \
>+	_gen/abi.nm \
>+	_gen/abi.tpfuncnames \
>+	_gen/abi.txt \
>+	_gen/version-script.txt \
>+	_gen/libtelepathy-logger-1-0.symbols \
>+	_gen/versioned-abi.tmp \
>+	_gen/versioned-abi.txt \
>+	$(NULL)
>+
> # vim:ft=automake:
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 76462: 96289

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.