[telepathy-python/master] Generate the list of spec files to generate and install them in the right place.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/Makefile.am |   44 +++++++-------------------------------------
 1 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 742911a..fdfc146 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,49 +7,17 @@ telepathy_PYTHON = \
 	__init__.py \
 	interfaces.py \
 	utils.py \
-	_version.py \
-	$(BUILT_SOURCES)
+	_version.py
 
-spec_files= \
-	_generated/Account_Interface_Avatar.py \
-	_generated/Account_Manager.py \
-	_generated/Account.py \
-	_generated/Channel_Handler.py \
-	_generated/Channel_Interface_Call_State.py \
-	_generated/Channel_Interface_Chat_State.py \
-	_generated/Channel_Interface_Destroyable.py \
-	_generated/Channel_Interface_DTMF.py \
-	_generated/Channel_Interface_Group.py \
-	_generated/Channel_Interface_Hold.py \
-	_generated/Channel_Interface_Media_Signalling.py \
-	_generated/Channel_Interface_Messages.py \
-	_generated/Channel_Interface_Password.py \
-	_generated/Channel_Type_Contact_List.py \
-	_generated/Channel_Type_Room_List.py \
-	_generated/Channel_Type_Streamed_Media.py \
-	_generated/Channel_Type_Text.py \
-	_generated/Channel_Type_Tubes.py \
-	_generated/Channel.py \
-	_generated/Connection_Interface_Aliasing.py \
-	_generated/Connection_Interface_Avatars.py \
-	_generated/Connection_Interface_Capabilities.py \
-	_generated/Connection_Interface_Contact_Capabilities.py \
-	_generated/Connection_Interface_Contacts.py \
-	_generated/Connection_Interface_Presence.py \
-	_generated/Connection_Interface_Requests.py \
-	_generated/Connection_Interface_Simple_Presence.py \
-	_generated/Connection_Manager.py \
-	_generated/Connection.py \
-	_generated/Media_Session_Handler.py \
-	_generated/Media_Stream_Handler.py \
-	_generated/Properties_Interface.py
+spec_dir = $(top_srcdir)/spec
+spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
 
 BUILT_SOURCES = \
 	_generated/interfaces.py \
 	_generated/constants.py \
 	_generated/errors.py \
 	_generated/__init__.py \
-	${spec_files}
+	$(spec_files)
 
 CLEANFILES = \
 	_version.py \
@@ -57,12 +25,14 @@ CLEANFILES = \
 
 EXTRA_DIST = _version.py.in
 
+generateddir = $(telepathydir)/_generated
+generated_PYTHON = $(BUILT_SOURCES)
+
 distclean-local:
 	rm -rf *.pyc _generated
 
 XSLTPROC_OPTS = --nonet --novalid --xinclude
 tools_dir = $(top_srcdir)/tools
-spec_dir = $(top_srcdir)/spec
 
 _generated/interfaces.py:
 	$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
-- 
1.5.6.5