summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-11-23 13:00:37 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-11-23 13:00:37 +0000
commit7d4a49a94f790b1e59c917de4a848d76c81ec340 (patch)
tree9597dc83b989f98940b85a6172dc24edbce0251a
parent3d1d629fc376c010300baba7298440d409a36cb4 (diff)
spec/: stop using spec-gen.am
-rw-r--r--autogen.sh7
-rw-r--r--spec/Makefile.am33
2 files changed, 28 insertions, 12 deletions
diff --git a/autogen.sh b/autogen.sh
index 2ae57c1f2..d2db5ba25 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,8 @@
#!/bin/sh
set -e
-if test -z "$MAKE"
-then
- MAKE=make
-fi
-
gtkdocize
-( cd spec && TOP_SRCDIR=.. sh ../tools/update-spec-gen-am.sh spec-gen.am )
-
autoreconf -i
run_configure=true
diff --git a/spec/Makefile.am b/spec/Makefile.am
index 0d82851c2..1be974e1f 100644
--- a/spec/Makefile.am
+++ b/spec/Makefile.am
@@ -1,9 +1,32 @@
EXTRA_DIST = \
all.xml \
+ Channel_Handler.xml \
+ Channel_Interface_Chat_State.xml \
+ Channel_Interface_DTMF.xml \
+ Channel_Interface_Group.xml \
+ Channel_Interface_Hold.xml \
+ Channel_Interface_Media_Signalling.xml \
+ Channel_Interface_Password.xml \
+ Channel_Interface_Transfer.xml \
+ Channel_Type_Contact_List.xml \
+ Channel_Type_Contact_Search.xml \
+ Channel_Type_Room_List.xml \
+ Channel_Type_Streamed_Media.xml \
+ Channel_Type_Text.xml \
+ Channel_Type_Tubes.xml \
+ Channel.xml \
+ Connection_Interface_Aliasing.xml \
+ Connection_Interface_Avatars.xml \
+ Connection_Interface_Capabilities.xml \
+ Connection_Interface_Contact_Info.xml \
+ Connection_Interface_Forwarding.xml \
+ Connection_Interface_Presence.xml \
+ Connection_Interface_Privacy.xml \
+ Connection_Interface_Renaming.xml \
+ Connection_Manager.xml \
+ Connection.xml \
errors.xml \
generic-types.xml \
- $(SPEC_INTERFACE_XMLS)
-
-# This is a derived file but must be checked-in to Darcs anyway, for
-# bootstrapping.
-include spec-gen.am
+ Media_Session_Handler.xml \
+ Media_Stream_Handler.xml \
+ Properties_Interface.xml