diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-06-22 13:32:38 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-06-22 14:56:49 +0100 |
| commit | 73cb882a9a9d5b9eb7e0e98c4c487bda6d77b611 (patch) | |
| tree | 71cbdaa9b99a4ddfdf1f9e4e24bcbe694e6dd21f /src/Makefile.am | |
| parent | a930c226ac85e7855a1dc562c8bd7570c1ac6677 (diff) | |
| download | telepathy-mission-control-73cb882a9a9d5b9eb7e0e98c4c487bda6d77b611.tar.gz | |
Turn MCD into a convenience library so one of the tests can link it statically
This fixes `make check` with --enable-plugins.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dca8c7d0..a46d7a17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ mc_gen_headers = \ _gen/svc-dispatch-operation.h \ _gen/svc-request.h -nodist_libmissioncontrol_server_la_SOURCES = \ +nodist_libmcd_convenience_la_SOURCES = \ _gen/cli-client-body.h \ _gen/cli-Connection_Interface_Contact_Capabilities-body.h \ _gen/gtypes-body.h \ @@ -80,21 +80,28 @@ BUILT_SOURCES = \ mcd-enum-types.c \ mcd-enum-types.h \ stamp-mcd-enum-types.h \ - $(nodist_libmissioncontrol_server_la_SOURCES) \ + $(nodist_libmcd_convenience_la_SOURCES) \ $(mc_gen_headers) CLEANFILES = $(BUILT_SOURCES) -libmissioncontrol_server_la_LIBADD = \ +libmcd_convenience_la_LIBADD = \ $(top_builddir)/libmcclient/libmcclient.la \ $(GCONF_LIBS) \ $(TELEPATHY_LIBS) \ $(DBUS_LIBS) \ $(GLIB_LIBS) +noinst_LTLIBRARIES = libmcd-convenience.la + if ENABLE_PLUGINS +# When plugins are enabled, libmissioncontrol-server.la is a shared library +# that wraps the convenience library lib_LTLIBRARIES = libmissioncontrol-server.la -libmissioncontrol_server_la_LIBADD += $(GMODULE_LIBS) +libmissioncontrol_server_la_SOURCES = +libmissioncontrol_server_la_LIBADD = \ + libmcd-convenience.la \ + $(GMODULE_LIBS) libmissioncontrol_server_la_LDFLAGS = \ -export-symbols-regex '^((mc_)|(mcd_)|(mission_control_))' @@ -116,11 +123,15 @@ nodist_geninclude_HEADERS = $(mc_gen_headers) INCLUDES += \ $(GMODULE_CFLAGS) \ -DMCD_DEFAULT_FILTER_PLUGIN_DIR=\"@pluginlibdir@\" -else # ENABLE_PLUGINS -noinst_LTLIBRARIES = libmissioncontrol-server.la -endif # ENABLE_PLUGINS - -libmissioncontrol_server_la_SOURCES = \ +else # ! ENABLE_PLUGINS +# When plugins are not enabled, libmissioncontrol-server.la is just a copy of +# the convenience library +noinst_LTLIBRARIES += libmissioncontrol-server.la +libmissioncontrol_server_la_SOURCES = +libmissioncontrol_server_la_LIBADD = $(builddir)/libmcd-convenience.la +endif # ! ENABLE_PLUGINS + +libmcd_convenience_la_SOURCES = \ mcd-account.c \ mcd-account-compat.c \ mcd-account-conditions.c \ |