diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-08 12:46:51 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-08 17:40:18 +0100 |
| commit | 182dae7a10bea7307a16a52d9d1216bf9e38457c (patch) | |
| tree | dda2c23e2de0d05a44de42bf693ea92cf2e1ecf5 /server/Makefile.am | |
| parent | 524c5a6e0cf654e092e54870470656bdeba3c408 (diff) | |
Remove deprecated support for old-style (mcd) plugins
Only in-tree code can use mcd_* functions now.
Diffstat (limited to 'server/Makefile.am')
| -rw-r--r-- | server/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index ba734500..76cd0030 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(ERROR_CFLAGS) -if HAVE_SERVER - EXTRA_DIST = org.freedesktop.Telepathy.MissionControl5.service.in \ org.freedesktop.Telepathy.AccountManager.service.in \ mission-control-5.8.in @@ -37,7 +35,7 @@ mission_control_5_LDADD = \ $(GLIB_LIBS) \ $(TELEPATHY_LIBS) \ $(DBUS_LIBS) \ - $(top_builddir)/src/libmissioncontrol-server.la \ + $(top_builddir)/src/libmcd-convenience.la \ $(top_builddir)/mission-control-plugins/libmission-control-plugins.la Android.mk: Makefile.am @@ -49,8 +47,6 @@ Android.mk: Makefile.am -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \ -DBUILD_AS_ANDROID_SERVICE \ -:LDFLAGS $(mission_control_5_LDADD) \ - -:LIBFILTER_STATIC missioncontrol-server mission-control-plugins \ + -:LIBFILTER_STATIC mcd-convenience mission-control-plugins \ mcclient \ > $@ - -endif |