diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 13:16:39 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 14:16:38 +0000 |
| commit | 43cdccdd11f90b0b1028616aee4a5433b0cb28bc (patch) | |
| tree | 251c4c567e0d5a0509b55ecda6f12027aa93ac97 | |
| parent | 1657f3becb26db72242861ba0f3c08208752a5e7 (diff) | |
| download | telepathy-glib-43cdccdd11f90b0b1028616aee4a5433b0cb28bc.tar.gz | |
logger, tpfs: distribute ABI lists, and clean up generated files
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76462
Reviewed-by: Xavier Claessens
| -rw-r--r-- | telepathy-farstream/Makefile.am | 16 | ||||
| -rw-r--r-- | telepathy-logger/Makefile.am | 1 | ||||
| -rw-r--r-- | telepathy-logger/abi.am | 12 |
3 files changed, 28 insertions, 1 deletions
diff --git a/telepathy-farstream/Makefile.am b/telepathy-farstream/Makefile.am index abe4e333c..ce104aa64 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 7d55e72d1..62374187a 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 7a6554389..4926b843e 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: |