[Bug 27274] Make the telepathy logger extensions library public

[bugzilla-daemon at freedesktop.org]

http://bugs.freedesktop.org/show_bug.cgi?id=27274





--- Comment #12 from Simon McVittie <simon.mcvittie at collabora.co.uk>  2010-03-26 08:20:07 PST ---
Have you tested this in both modes, and checked what gets installed, and what
goes into a "make dist" tarball? I infer that you haven't, because afaics,
extensions.h will get installed even if the library isn't, and some of the
generated stuff incorrectly goes in the tarball.

> +libtpl_extensions_convenience_ladir = $(tplincludedir)

This is, at best, weird... the prefix for foo_HEADERS is normally something
like "tplinclude", not a library name. Saying
"libtpl_extensions_convenience_la_HEADERS" doesn't cause those headers to be
related to libtpl-extensions-convenience.la.

> +libtpl_extensions_convenience_la_HEADERS = \

Please call this something that isn't special to Automake, like
"extension_headers", and then do:

libtpl_extensions_convenience_la_SOURCES = \
       ...
       $(extension_headers) \
       $(NULL)

to get them distributed in the tarball. (You could also reference them in
EXTRA_DIST, but I think treating them like sources - which are automatically
distributed - is nicer.)

Inside the conditional for the public ext.library, also do:

tplinclude_HEADERS += $(extension_headers)

to get them installed (conditionally!).

> -libtpl_extensions_la_SOURCES = \
> +libtpl_extensions_convenience_la_SOURCES = \
>      extensions.c \
>      extensions-cli.c \
>      $(nodist_libtpl_extensions_internal_la_SOURCES) \
>      $(NULL)

nodist sources shouldn't be included in a normal SOURCES list; that defeats the
point of having them be nodist-prefixed. Rename the variable to say
"convenience" rather than "internal" and remove this reference to it, and
they'll automatically be included in the link, but not distributed in the
tarball, as desired.

>  21 nodist_geninclude_HEADERS = \

If these aren't needed by telepathy-logger itself (and I rather hope they're
not), the variable should be called "gen_headers" or something. It should be
included by reference in $(nodist_libtpl_extensions_internal_la_SOURCES) (much
like extension_headers above, but as a nodist flavour).

Inside the conditional for libtpl-extensions.la, you should do something like:

geninclude_HEADERS += $(gen_headers)

(again, much like extension_headers).


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.