diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-12-03 12:57:34 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-12-03 12:57:34 +0000 |
| commit | b1fa39f2c83b24aa172d8c3d9039d18ebc0173e3 (patch) | |
| tree | 4e10a90e115c562d60a20e0499a78fe2ddc448c1 /examples/extensions | |
| parent | db2f4e0dc80195cb1f2672adc1cd48381c67cb09 (diff) | |
| download | telepathy-glib-b1fa39f2c83b24aa172d8c3d9039d18ebc0173e3.tar.gz | |
Simplify makefiles and avoid using $(TP_GLIB_LIBS)
Autoconf substitutions in *_LDADD do not generate Makefile dependencies,
so using $(TP_GLIB_LIBS) meant that the tests were not automatically
rebuilt when telepathy-glib changed.
Also, we overlooked the existence of LDADD, which has an effect analogous
to AM_CFLAGS and allows a lot of simplification.
Diffstat (limited to 'examples/extensions')
| -rw-r--r-- | examples/extensions/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am index 3f909b4cd..c206640bc 100644 --- a/examples/extensions/Makefile.am +++ b/examples/extensions/Makefile.am @@ -22,8 +22,12 @@ EXTRA_DIST = \ noinst_LTLIBRARIES = libexample-extensions.la +# In an external project you'd use $(TP_GLIB_LIBS) (obtained from +# pkg-config via autoconf) instead of the .la path libexample_extensions_la_LIBADD = \ - $(TP_GLIB_LIBS) + $(GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/telepathy-glib/libtelepathy-glib.la # The client-specific parts are built into a separate .o file, so the linker # can discard them when linking services. The service-specific parts are |