Use a spec directory layout more similar to tp-glib

13 files changed, 19 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index f62c9a3..22c7d4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 tools telepathy-yell
+SUBDIRS = m4 tools spec telepathy-yell
 
 EXTRA_DIST = \
     autogen.sh
diff --git a/configure.ac b/configure.ac
index b5157c7..1889a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,5 +128,6 @@ AC_OUTPUT( Makefile \
 	   telepathy-yell/telepathy-yell.pc \
 	   telepathy-yell/telepathy-yell-uninstalled.pc \
 	   tools/Makefile \
+	   spec/Makefile \
 	   m4/Makefile
 )
diff --git a/telepathy-yell/Call_Content.xml b/spec/Call_Content.xml
index 17ed710..17ed710 100644
--- a/telepathy-yell/Call_Content.xml
+++ b/spec/Call_Content.xml
diff --git a/telepathy-yell/Call_Content_Codec_Offer.xml b/spec/Call_Content_Codec_Offer.xml
index f88143f..f88143f 100644
--- a/telepathy-yell/Call_Content_Codec_Offer.xml
+++ b/spec/Call_Content_Codec_Offer.xml
diff --git a/telepathy-yell/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml
index 274d8b2..274d8b2 100644
--- a/telepathy-yell/Call_Content_Interface_Media.xml
+++ b/spec/Call_Content_Interface_Media.xml
diff --git a/telepathy-yell/Call_Content_Interface_Mute.xml b/spec/Call_Content_Interface_Mute.xml
index f926e03..f926e03 100644
--- a/telepathy-yell/Call_Content_Interface_Mute.xml
+++ b/spec/Call_Content_Interface_Mute.xml
diff --git a/telepathy-yell/Call_Stream.xml b/spec/Call_Stream.xml
index 1d7b281..1d7b281 100644
--- a/telepathy-yell/Call_Stream.xml
+++ b/spec/Call_Stream.xml
diff --git a/telepathy-yell/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml
index 4818168..4818168 100644
--- a/telepathy-yell/Call_Stream_Endpoint.xml
+++ b/spec/Call_Stream_Endpoint.xml
diff --git a/telepathy-yell/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 5f2bbec..5f2bbec 100644
--- a/telepathy-yell/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
diff --git a/telepathy-yell/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index eb1a663..eb1a663 100644
--- a/telepathy-yell/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
diff --git a/spec/Makefile.am b/spec/Makefile.am
new file mode 100644
index 0000000..f0d43af
--- /dev/null
+++ b/spec/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST = \
+    Call_Content_Codec_Offer.xml \
+    Call_Content_Interface_Media.xml \
+    Call_Content_Interface_Mute.xml \
+    Call_Content.xml \
+    Call_Stream_Endpoint.xml \
+    Call_Stream_Interface_Media.xml \
+    Call_Stream.xml \
+    Channel_Type_Call.xml
diff --git a/telepathy-yell/Makefile.am b/telepathy-yell/Makefile.am
index 757812c..83b20d3 100644
--- a/telepathy-yell/Makefile.am
+++ b/telepathy-yell/Makefile.am
@@ -1,12 +1,4 @@
 EXTRA_DIST = \
-    Call_Content_Codec_Offer.xml \
-    Call_Content_Interface_Media.xml \
-    Call_Content_Interface_Mute.xml \
-    Call_Content.xml \
-    Call_Stream_Endpoint.xml \
-    Call_Stream_Interface_Media.xml \
-    Call_Stream.xml \
-    Channel_Type_Call.xml \
     call.xml \
     all.xml
 
diff --git a/telepathy-yell/call.xml b/telepathy-yell/call.xml
index 7e016b5..ff02277 100644
--- a/telepathy-yell/call.xml
+++ b/telepathy-yell/call.xml
@@ -4,13 +4,13 @@
 
 <tp:title>Call interfaces</tp:title>
 
-<xi:include href="Call_Content.xml" />
-<xi:include href="Call_Content_Codec_Offer.xml" />
-<xi:include href="Call_Content_Interface_Media.xml" />
-<xi:include href="Call_Content_Interface_Mute.xml" />
-<xi:include href="Call_Stream.xml" />
-<xi:include href="Call_Stream_Endpoint.xml" />
-<xi:include href="Call_Stream_Interface_Media.xml" />
-<xi:include href="Channel_Type_Call.xml" />
+<xi:include href="../spec/Call_Content.xml" />
+<xi:include href="../spec/Call_Content_Codec_Offer.xml" />
+<xi:include href="../spec/Call_Content_Interface_Media.xml" />
+<xi:include href="../spec/Call_Content_Interface_Mute.xml" />
+<xi:include href="../spec/Call_Stream.xml" />
+<xi:include href="../spec/Call_Stream_Endpoint.xml" />
+<xi:include href="../spec/Call_Stream_Interface_Media.xml" />
+<xi:include href="../spec/Channel_Type_Call.xml" />
 
 </tp:spec>