2008-08-21 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/core/uifw/at-spi2-atk.git] / xml / Makefile.am

diff --git a/xml/Makefile.am b/xml/Makefile.am
index 58a2b2d..cd16642 100644 (file)
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -3,35 +3,45 @@ XML_SPEC= \
        org.freedesktop.atspi.Accessible.xml \
        org.freedesktop.atspi.Action.xml \
        org.freedesktop.atspi.Application.xml \
+       org.freedesktop.atspi.Collection.xml \
        org.freedesktop.atspi.Component.xml \
+       org.freedesktop.atspi.Desktop.xml \
        org.freedesktop.atspi.Document.xml \
        org.freedesktop.atspi.EditableText.xml \
        org.freedesktop.atspi.Hyperlink.xml \
        org.freedesktop.atspi.Hypertext.xml \
        org.freedesktop.atspi.Image.xml \
        org.freedesktop.atspi.LoginHelper.xml \
-       Accessibility_Registry_Common.xml \
+       org.freedesktop.atspi.Registry.Common.xml \
        org.freedesktop.atspi.Registry.xml \
        org.freedesktop.atspi.DeviceEventController.xml \
        org.freedesktop.atspi.DeviceEventListener.xml \
-       Accessibility_Role.xml \
+       org.freedesktop.atspi.Relation.xml \
+       org.freedesktop.atspi.Role.xml \
        org.freedesktop.atspi.Selection.xml \
        org.freedesktop.atspi.Selector.xml \
-       Accessibility_State.xml \
+       org.freedesktop.atspi.State.xml \
        org.freedesktop.atspi.StreamableContent.xml \
        org.freedesktop.atspi.Table.xml \
        org.freedesktop.atspi.Text.xml \
+       org.freedesktop.atspi.Tree.xml \
        org.freedesktop.atspi.Value.xml
 
 spec.xml: $(XML_SPEC)
-       xsltproc --xinclude ../tools/identity.xsl $< >$@
+       xsltproc --xinclude $(top_srcdir)/tools/identity.xsl $< >$@
 
-EXTRA_DIST = $(XML_SPEC)
+# I'm only adding spec.xml because it is needed to build other files that
+# are currently being distributed. -MPG
+EXTRA_DIST = $(XML_SPEC) spec.xml
+
+BUILT_SOURCES = spec.xml
+CLEANFILES = spec.xml
 
 INTROSPECT_FILES = $(addprefix introspection/,$(patsubst %.xml,%,$(filter org.freedesktop.atspi%,$(XML_SPEC))))
 
 $(INTROSPECT_FILES): introspection/%: %.xml ../tools/spec-to-introspect.xsl
+       @mkdir -p introspection
        xsltproc ../tools/spec-to-introspect.xsl $< |sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g' >$@
 
-introspectdir = $(pkgdatadir)/dbus
+introspectdir = $(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)
 dist_introspect_DATA = $(INTROSPECT_FILES)