summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--doc/.gitignore2
-rw-r--r--doc/Makefile.am41
-rw-r--r--doc/dbus/.gitignore6
-rw-r--r--doc/dbus/ConsoleKit.xml.in (renamed from doc/ConsoleKit.xml.in)0
-rw-r--r--doc/dbus/Makefile.am46
-rw-r--r--doc/dbus/ck-design.xml (renamed from doc/xml/ck-design.xml)0
-rw-r--r--doc/dbus/ck-introduction.xml (renamed from doc/xml/ck-introduction.xml)0
-rw-r--r--doc/dbus/ck-terms.xml (renamed from doc/xml/ck-terms.xml)0
-rw-r--r--doc/dbus/config.xsl (renamed from doc/config.xsl)0
-rw-r--r--doc/dbus/dbus-introspect-docs.dtd (renamed from doc/dbus-introspect-docs.dtd)0
-rw-r--r--doc/dbus/docbook.css (renamed from doc/docbook.css)0
-rw-r--r--doc/dbus/spec-to-docbook.xsl (renamed from doc/xml/spec-to-docbook.xsl)0
-rw-r--r--doc/xml/Makefile.am20
14 files changed, 55 insertions, 64 deletions
diff --git a/configure.ac b/configure.ac
index b55a3d5..e0b7e98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,8 +396,8 @@ tools/freebsd/Makefile
tools/solaris/Makefile
data/Makefile
doc/Makefile
-doc/ConsoleKit.xml
-doc/xml/Makefile
+doc/dbus/ConsoleKit.xml
+doc/dbus/Makefile
libck-connector/Makefile
libck-connector/ck-connector.pc
pam-ck-connector/Makefile
diff --git a/doc/.gitignore b/doc/.gitignore
index 4337b46..35e3b27 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,4 @@
Makefile
Makefile.in
-ConsoleKit.xml
-ConsoleKit.html
*.o
*~
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 31db823..2b95778 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,41 +1,2 @@
-NULL =
+SUBDIRS = dbus
-SUBDIRS = xml
-
-SPEC_XML_FILES = \
- ConsoleKit.xml \
- xml/ck-introduction.xml \
- xml/ck-terms.xml \
- xml/ck-design.xml \
- xml/org.freedesktop.ConsoleKit.Manager.ref.xml \
- xml/org.freedesktop.ConsoleKit.Seat.ref.xml \
- xml/org.freedesktop.ConsoleKit.Session.ref.xml \
- $(NULL)
-
-if DOCBOOK_DOCS_ENABLED
-
-htmldocdir = $(docdir)/spec
-htmldoc_DATA = ConsoleKit.html
-
-ConsoleKit.html : $(SPEC_XML_FILES)
- $(XMLTO) xhtml-nochunks -m config.xsl ConsoleKit.xml
-
-endif # DOCBOOK_DOCS_ENABLED
-
-EXTRA_DIST = \
- ConsoleKit.xml.in \
- config.xsl \
- docbook.css \
- dbus-introspect-docs.dtd \
- $(SPEC_XML_FILES)
- $(NULL)
-
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- $(NULL)
-
-clean-local:
- rm -f *~
- rm -f ConsoleKit.html
diff --git a/doc/dbus/.gitignore b/doc/dbus/.gitignore
new file mode 100644
index 0000000..4337b46
--- /dev/null
+++ b/doc/dbus/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+ConsoleKit.xml
+ConsoleKit.html
+*.o
+*~
diff --git a/doc/ConsoleKit.xml.in b/doc/dbus/ConsoleKit.xml.in
index 8a86511..8a86511 100644
--- a/doc/ConsoleKit.xml.in
+++ b/doc/dbus/ConsoleKit.xml.in
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
new file mode 100644
index 0000000..d8bb0ee
--- /dev/null
+++ b/doc/dbus/Makefile.am
@@ -0,0 +1,46 @@
+NULL =
+
+SPEC_XML_FILES = \
+ ConsoleKit.xml \
+ ck-introduction.xml \
+ ck-terms.xml \
+ ck-design.xml \
+ org.freedesktop.ConsoleKit.Manager.ref.xml \
+ org.freedesktop.ConsoleKit.Seat.ref.xml \
+ org.freedesktop.ConsoleKit.Session.ref.xml \
+ $(NULL)
+
+if DOCBOOK_DOCS_ENABLED
+
+htmldocdir = $(docdir)/spec
+htmldoc_DATA = ConsoleKit.html
+
+ConsoleKit.html : $(SPEC_XML_FILES)
+ $(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
+
+endif # DOCBOOK_DOCS_ENABLED
+
+org.freedesktop.ConsoleKit.Manager.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Manager.xml spec-to-docbook.xsl
+ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+org.freedesktop.ConsoleKit.Seat.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Seat.xml spec-to-docbook.xsl
+ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+org.freedesktop.ConsoleKit.Session.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Session.xml spec-to-docbook.xsl
+ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+
+EXTRA_DIST = \
+ spec-to-docbook.xsl \
+ ConsoleKit.xml.in \
+ config.xsl \
+ docbook.css \
+ dbus-introspect-docs.dtd \
+ $(SPEC_XML_FILES)
+ $(NULL)
+
+MAINTAINERCLEANFILES = \
+ *~ \
+ Makefile.in \
+ $(NULL)
+
+clean-local:
+ rm -f *~ *.ref.xml
+ rm -f ConsoleKit.html
diff --git a/doc/xml/ck-design.xml b/doc/dbus/ck-design.xml
index 1148773..1148773 100644
--- a/doc/xml/ck-design.xml
+++ b/doc/dbus/ck-design.xml
diff --git a/doc/xml/ck-introduction.xml b/doc/dbus/ck-introduction.xml
index b38adf5..b38adf5 100644
--- a/doc/xml/ck-introduction.xml
+++ b/doc/dbus/ck-introduction.xml
diff --git a/doc/xml/ck-terms.xml b/doc/dbus/ck-terms.xml
index d3d544d..d3d544d 100644
--- a/doc/xml/ck-terms.xml
+++ b/doc/dbus/ck-terms.xml
diff --git a/doc/config.xsl b/doc/dbus/config.xsl
index 7aa9def..7aa9def 100644
--- a/doc/config.xsl
+++ b/doc/dbus/config.xsl
diff --git a/doc/dbus-introspect-docs.dtd b/doc/dbus/dbus-introspect-docs.dtd
index ca918fb..ca918fb 100644
--- a/doc/dbus-introspect-docs.dtd
+++ b/doc/dbus/dbus-introspect-docs.dtd
diff --git a/doc/docbook.css b/doc/dbus/docbook.css
index 6a7373e..6a7373e 100644
--- a/doc/docbook.css
+++ b/doc/dbus/docbook.css
diff --git a/doc/xml/spec-to-docbook.xsl b/doc/dbus/spec-to-docbook.xsl
index 1864414..1864414 100644
--- a/doc/xml/spec-to-docbook.xsl
+++ b/doc/dbus/spec-to-docbook.xsl
diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
deleted file mode 100644
index 4c279be..0000000
--- a/doc/xml/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-NULL =
-
-all : org.freedesktop.ConsoleKit.Manager.ref.xml org.freedesktop.ConsoleKit.Seat.ref.xml org.freedesktop.ConsoleKit.Session.ref.xml
-
-org.freedesktop.ConsoleKit.Manager.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Manager.xml spec-to-docbook.xsl
- $(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
-org.freedesktop.ConsoleKit.Seat.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Seat.xml spec-to-docbook.xsl
- $(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
-org.freedesktop.ConsoleKit.Session.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Session.xml spec-to-docbook.xsl
- $(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
-
-EXTRA_DIST = spec-to-docbook.xsl
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- $(NULL)
-
-clean-local:
- rm -f *~ *.ref.xml