diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-03-27 20:34:05 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-03-27 20:34:09 +0000 |
| commit | ee8f3e731a015b390e8914f95f48c491f3ac6248 (patch) | |
| tree | 785f0226e4fc34c64d7a85958ee9fd983d1986fc | |
| parent | 662c6b52d0abbf2f06e20416bfc87d8190c35354 (diff) | |
| parent | 2166db570365d7b8225c230c3ea315cf2ce18612 (diff) | |
Merge branch 'distcheck'
Reviewed-by: Alberto Mardegan <alberto.mardegan@nokia.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | libmcclient/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | test/twisted/Makefile.am | 2 | ||||
| -rw-r--r-- | xml/Makefile.am | 1 |
5 files changed, 6 insertions, 0 deletions
@@ -67,6 +67,7 @@ server/mission-control server/org.freedesktop.Telepathy.AccountManager.service server/org.freedesktop.Telepathy.MissionControl.service tags +/telepathy-mission-control-5* test/mc-client test/twisted/with-session-bus-*.dbus-monitor-logs test/twisted/accounts/accounts.cfg diff --git a/libmcclient/Makefile.am b/libmcclient/Makefile.am index b587eb30..5cfa8e4f 100644 --- a/libmcclient/Makefile.am +++ b/libmcclient/Makefile.am @@ -97,6 +97,7 @@ EXTRA_DIST = \ account.xml \ account-manager.xml \ client.xml \ + dispatch-operation.xml \ mc-quark.list \ mc-signals-marshal.list diff --git a/src/Makefile.am b/src/Makefile.am index dcb50dc4..3d4d8678 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -198,6 +198,7 @@ mcd-service-gen.h: $(top_builddir)/xml/MissionControl-gen.xml EXTRA_DIST = \ client.xml \ + dispatch-operation.xml \ mcd-signals-marshal.list \ stamp-mcd-enum-types.h diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am index a088d55e..78397034 100644 --- a/test/twisted/Makefile.am +++ b/test/twisted/Makefile.am @@ -47,12 +47,14 @@ EXTRA_DIST = \ telepathy/clients/README \ telepathy/managers/fakecm.manager \ telepathy/managers/README \ + constants.py \ fakeclient.py \ fakecm.py \ mctest.py \ servicetest.py CLEANFILES = \ + accounts/accounts.cfg \ mc-[1-9]*.log \ *.pyc \ */*.pyc \ diff --git a/xml/Makefile.am b/xml/Makefile.am index 7a1b7997..3a78d00b 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am @@ -14,6 +14,7 @@ SPECS = MissionControl.xml \ Account_Interface_Compat.xml \ Account_Interface_Conditions.xml \ Account_Interface_Stats.xml \ + Channel_Dispatch_Operation.xml \ Client.xml \ Client_Approver.xml \ Client_Handler.xml \ |