diff options
| author | Milan Crha <mcrha@redhat.com> | 2016-10-10 15:16:25 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2016-10-10 15:16:25 +0200 |
| commit | 2f505851c3a5e0e4aa1dfd0a71e67035810cb8fb (patch) | |
| tree | a4f2acc1d53b7d0885be5e39e235d13f3f41798f /docs | |
| parent | 57ad04c29303723dd8fa4082aeb6380c0873265f (diff) | |
| download | evolution-data-server-2f505851c3a5e0e4aa1dfd0a71e67035810cb8fb.tar.gz | |
Convert from autotools to CMake
Diffstat (limited to 'docs')
24 files changed, 122 insertions, 432 deletions
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt new file mode 100644 index 000000000..90bb2b596 --- /dev/null +++ b/docs/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(reference) diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 034926c59..000000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = reference - --include $(top_srcdir)/git.mk diff --git a/docs/reference/CMakeLists.txt b/docs/reference/CMakeLists.txt new file mode 100644 index 000000000..9a9144b7e --- /dev/null +++ b/docs/reference/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(camel) +add_subdirectory(evolution-data-server) + +if(WITH_PRIVATE_DOCS) + add_subdirectory(private) +endif(WITH_PRIVATE_DOCS) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am deleted file mode 100644 index c313e8b89..000000000 --- a/docs/reference/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -NULL = - -if WITH_PRIVATE_DOCS -PRIVATE_DIR = private -endif - -SUBDIRS = \ - eds \ - camel \ - $(PRIVATE_DIR) \ - $(NULL) - -MKDB_OPTIONS=--output-format=xml --name-space=e - --include $(top_srcdir)/git.mk diff --git a/docs/reference/camel/CMakeLists.txt b/docs/reference/camel/CMakeLists.txt new file mode 100644 index 000000000..da02752a9 --- /dev/null +++ b/docs/reference/camel/CMakeLists.txt @@ -0,0 +1,34 @@ +set(SOURCEDIRS + ${CMAKE_SOURCE_DIR}/camel + ${CMAKE_SOURCE_DIR}/camel/providers/local + ${CMAKE_SOURCE_DIR}/camel/providers/imapx + ${CMAKE_SOURCE_DIR}/camel/providers/nntp + ${CMAKE_SOURCE_DIR}/camel/providers/pop3 + ${CMAKE_SOURCE_DIR}/camel/providers/sendmail + ${CMAKE_SOURCE_DIR}/camel/providers/smtp +) + +set(DEPENDENCIES + camel + camellocal + camelimapx + camelnntp + camelpop3 + camelsendmail + camelsmtp +) + +set(IGNORE_HEADERS + camel-charset-map-private.h + camel-enumtypes.h + camel-i18n.h + camel-imapx-tokenise.h + camel-imapx-utils.h + camel-local-private.h + camel-nntp-private.h + camel-nntp-resp-codes.h + camel-search-private.h + camel-win32.h +) + +add_gtkdoc(camel camel "CAMEL_DISABLE_DEPRECATED" SOURCEDIRS DEPENDENCIES IGNORE_HEADERS) diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am deleted file mode 100644 index 0a0f8e36f..000000000 --- a/docs/reference/camel/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -NULL = - -# The name of the module. -DOC_MODULE = camel - -# The top-level SGML file. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml - -# The directory containing the source code (if it contains documentation). -DOC_SOURCE_DIR = $(top_srcdir)/camel - -HTML_DIR = $(datadir)/gtk-doc/html - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS = --deprecated-guards="CAMEL_DISABLE_DEPRECATED" --rebuild-sections --rebuild-types - -# Extra options to pass to gtkdoc-scangobj -SCANGOBJ_OPTIONS = - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=camel - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -GTKDOC_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/camel/providers \ - -I$(top_builddir) \ - -I$(top_builddir)/camel \ - -I$(top_builddir)/camel/providers \ - $(CAMEL_CFLAGS) \ - $(NULL) - -GTKDOC_LIBS = \ - $(top_builddir)/camel/libcamel-1.2.la \ - $(top_builddir)/camel/providers/local/libcamellocal.la \ - $(top_builddir)/camel/providers/imapx/libcamelimapx.la \ - $(top_builddir)/camel/providers/nntp/libcamelnntp.la \ - $(top_builddir)/camel/providers/pop3/libcamelpop3.la \ - $(top_builddir)/camel/providers/sendmail/libcamelsendmail.la \ - $(top_builddir)/camel/providers/smtp/libcamelsmtp.la \ - $(CAMEL_LIBS) \ - $(NULL) - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) -content_files = tree_index.sgml - -# Used for dependencies. The docs will be rebuilt if any of these change. -HFILE_GLOB=$(top_srcdir)/camel/*.h -CFILE_GLOB=$(top_srcdir)/camel/*.c - -# Header files to ignore when scanning -# XXX Ignore the imapx provider for now. -IGNORE_HFILES = \ - camel-charset-map-private.h \ - camel-enumtypes.h \ - camel-i18n.h \ - camel-imapx-tokenise.h \ - camel-imapx-utils.h \ - camel-local-private.h \ - camel-nntp-private.h \ - camel-nntp-resp-codes.h \ - camel-search-private.h \ - camel-win32.h \ - tests \ - $(NULL) - -GITIGNOREFILES = \ - $(DOC_MODULE)-overrides.txt \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).types \ - $(NULL) - -DISTCLEANFILES = $(GITIGNOREFILES) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += \ - $(content_files) \ - $(GITIGNOREFILES) \ - $(DOC_MODULE)-docs.sgml \ - $(NULL) - -#TESTS = $(GTKDOC_CHECK) - --include $(top_srcdir)/git.mk diff --git a/docs/reference/camel/camel-docs.sgml b/docs/reference/camel/camel-docs.sgml.in index 2df9f3d4f..65cdf98ce 100644 --- a/docs/reference/camel/camel-docs.sgml +++ b/docs/reference/camel/camel-docs.sgml.in @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> ]> @@ -27,7 +27,7 @@ <abstract> <para>This manual documents the interfaces of the Camel - library.</para> + library @PROJECT_VERSION@.</para> </abstract> </bookinfo> @@ -276,10 +276,6 @@ </part> - <chapter id="ClassTree"> - <title>Class Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> <index id="api-index-full"> <title>Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> diff --git a/docs/reference/camel/tree_index.sgml b/docs/reference/camel/tree_index.sgml deleted file mode 100644 index 8f340790a..000000000 --- a/docs/reference/camel/tree_index.sgml +++ /dev/null @@ -1,66 +0,0 @@ -<screen> - <link linkend="CamelException">CamelException</link> - <link linkend="CamelObject">CamelObject</link> - <link linkend="CamelAddress">CamelAddress</link> - <link linkend="CamelInternetAddress">CamelInternetAddress</link> - <link linkend="CamelDataWrapper">CamelDataWrapper</link> - <link linkend="CamelMedium">CamelMedium</link> - <link linkend="CamelMimePart">CamelMimePart</link> - <link linkend="CamelMimeMessage">CamelMimeMessage</link> - <link linkend="CamelMultipart">CamelMultipart</link> - <link linkend="CamelMultipartEncrypted">CamelMultipartEncrypted</link> - <link linkend="CamelMultipartSigned">CamelMultipartSigned</link> - <link linkend="CamelCipherContext">CamelCipherContext</link> - <link linkend="CamelGpgContext">CamelGpgContext</link> - <link linkend="CamelSMIMEContext">CamelSMIMEContext</link> - <link linkend="CamelFolder">CamelFolder</link> - <link linkend="CamelOfflineFolder">CamelOfflineFolder</link> - <link linkend="CamelVeeFolder">CamelVeeFolder</link> - <link linkend="CamelVTrashFolder">CamelVTrashFolder</link> - <link linkend="CamelFolderSummary">CamelFolderSummary</link> - <link linkend="CamelVeeSummary">CamelVeeSummary</link> - <link linkend="CamelMimeFilter">CamelMimeFilter</link> - <link linkend="CamelMimeFilterBasic">CamelMimeFilterBasic</link> - <link linkend="CamelMimeFilterBestenc">CamelMimeFilterBestenc</link> - <link linkend="CamelMimeFilterCanon">CamelMimeFilterCanon</link> - <link linkend="CamelMimeFilterCharset">CamelMimeFilterCharset</link> - <link linkend="CamelMimeFilterCRLF">CamelMimeFilterCRLF</link> - <link linkend="CamelMimeFilterEnriched">CamelMimeFilterEnriched</link> - <link linkend="CamelMimeFilterFrom">CamelMimeFilterFrom</link> - <link linkend="CamelMimeFilterHTML">CamelMimeFilterHTML</link> - <link linkend="CamelMimeFilterIndex">CamelMimeFilterIndex</link> - <link linkend="CamelMimeFilterSave">CamelMimeFilterSave</link> - <link linkend="CamelMimeFilterToHTML">CamelMimeFilterToHTML</link> - <link linkend="CamelMimeFilterWindows">CamelMimeFilterWindows</link> - <link linkend="CamelMimeFilterYenc">CamelMimeFilterYenc</link> - <link linkend="CamelMimeParser">CamelMimeParser</link> - <link linkend="CamelOfflineJournal">CamelOfflineJournal</link> - <link linkend="CamelSasl">CamelSasl</link> - <link linkend="CamelSaslAnonymous">CamelSaslAnonymous</link> - <link linkend="CamelSaslCramMd5">CamelSaslCramMd5</link> - <link linkend="CamelSaslDigestMd5">CamelSaslDigestMd5</link> - <link linkend="CamelSaslGssapi">CamelSaslGssapi</link> - <link linkend="CamelSaslLogin">CamelSaslLogin</link> - <link linkend="CamelSaslNTLM">CamelSaslNTLM</link> - <link linkend="CamelSaslPlain">CamelSaslPlain</link> - <link linkend="CamelSaslPOPB4SMTP">CamelSaslPOPB4SMTP</link> - <link linkend="CamelService">CamelService</link> - <link linkend="CamelStore">CamelStore</link> - <link linkend="CamelOfflineStore">CamelOfflineStore</link> - <link linkend="CamelVeeStore">CamelVeeStore</link> - <link linkend="CamelTransport">CamelTransport</link> - <link linkend="CamelSession">CamelSession</link> - <link linkend="CamelStoreSummary">CamelStoreSummary</link> - <link linkend="CamelStream">CamelStream</link> - <link linkend="CamelSeekableStream">CamelSeekableStream</link> - <link linkend="CamelSeekableSubstream">CamelSeekableSubstream</link> - <link linkend="CamelStreamFs">CamelStreamFs</link> - <link linkend="CamelStreamMem">CamelStreamMem</link> - <link linkend="CamelStreamBuffer">CamelStreamBuffer</link> - <link linkend="CamelStreamFilter">CamelStreamFilter</link> - <link linkend="CamelStreamNull">CamelStreamNull</link> - <link linkend="CamelStreamProcess">CamelStreamProcess</link> - <link linkend="CamelTcpStream">CamelTcpStream</link> - <link linkend="CamelTcpStreamRaw">CamelTcpStreamRaw</link> - <link linkend="CamelTcpStreamSSL">CamelTcpStreamSSL</link> -</screen> diff --git a/docs/reference/eds/Makefile.am b/docs/reference/eds/Makefile.am deleted file mode 100644 index 8e955f248..000000000 --- a/docs/reference/eds/Makefile.am +++ /dev/null @@ -1,169 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# Some local variables -IMAGE_DIR = $(top_srcdir)/docs/reference/eds/images -IMAGE_SOURCE_DIR = $(top_srcdir)/docs/reference/eds/image-sources - -# The name of the module, e.g. 'glib'. -DOC_MODULE = eds - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -DOC_SOURCE_DIR = \ - $(top_srcdir)/libebackend \ - $(top_srcdir)/libedataserver \ - $(top_srcdir)/addressbook/libebook \ - $(top_srcdir)/addressbook/libebook-contacts \ - $(top_srcdir)/addressbook/libedata-book \ - $(top_srcdir)/calendar/libecal \ - $(top_srcdir)/calendar/libedata-cal \ - $(top_srcdir)/tests/test-server-utils - -# Exceptions, files which should not be documented -IGNORE_HFILES = \ - e-alphabet-index-private.h \ - e-backend-enumtypes.h \ - e-book-enumtypes.h \ - e-book-contacts-enumtypes.h \ - e-cal-enumtypes.h \ - e-client-private.h \ - e-data-cal-types.h \ - e-phone-number-private.h \ - e-source-enumtypes.h \ - e-transliterator-private.h \ - libedataserver-private.h \ - ximian-vcard.h - $(NULL) - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS = - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED" --rebuild-sections --rebuild-types - -# Extra options to supply to gtkdoc-mkdb -# We must enable the SGML mode so that we can have HTML tables -# in the documentation (e.g. to illustrate phone number matching). -MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=e - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -# XXX We'll maybe want to use this to cross-ref into GTK+ docs... -FIXXREF_OPTIONS= - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB = \ - $(top_builddir)/private/*.h \ - $(top_srcdir)/libedataserver/*.h \ - $(top_srcdir)/libebackend/*.h \ - $(top_srcdir)/addressbook/libebook-contacts/*.h \ - $(top_srcdir)/addressbook/libebook/*.h \ - $(top_srcdir)/addressbook/libedata-book/*.h \ - $(top_srcdir)/calendar/libecal/*.h \ - $(top_srcdir)/calendar/libedata-cal/*.h \ - $(top_srcdir)/tests/test-server-utils/*.h - -CFILE_GLOB = \ - $(top_builddir)/private/*.c \ - $(top_srcdir)/libedataserver/*.c \ - $(top_srcdir)/libebackend/*.c \ - $(top_srcdir)/addressbook/libebook-contacts/*.c \ - $(top_srcdir)/addressbook/libebook/*.c \ - $(top_srcdir)/addressbook/libedata-book/*.c \ - $(top_srcdir)/calendar/libecal/*.c \ - $(top_srcdir)/calendar/libedata-cal/*.c \ - $(top_srcdir)/tests/test-server-utils/*.c - -HTML_IMAGES = \ - $(IMAGE_DIR)/cursor-positions.png \ - $(IMAGE_DIR)/cursor-positions-filtered.png \ - $(IMAGE_DIR)/cursor-positions-step.png \ - $(IMAGE_DIR)/cursor-alphabetic-indexes.png - -HTML_IMAGE_SOURCE_FILES = \ - $(IMAGE_SOURCE_DIR)/cursor-positions.odg \ - $(IMAGE_SOURCE_DIR)/cursor-positions-filtered.odg \ - $(IMAGE_SOURCE_DIR)/cursor-positions-step.odg \ - $(IMAGE_SOURCE_DIR)/cursor-alphabetic-indexes.odg - -SGML_FILES= \ - eds-cursor-example.sgml - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files= version.xml $(SGML_FILES) - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files= $(SGML_FILES) - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/addressbook \ - -I$(top_srcdir)/calendar \ - -I$(top_builddir) \ - -I$(top_builddir)/addressbook \ - -I$(top_builddir)/calendar \ - $(CAMEL_CFLAGS) $(E_DATA_SERVER_CFLAGS) $(E_BACKEND_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) $(EVOLUTION_CALENDAR_CFLAGS) - -GTKDOC_LIBS = \ - $(top_builddir)/camel/libcamel-1.2.la \ - $(top_builddir)/libebackend/libebackend-1.2.la \ - $(top_builddir)/libedataserver/libedataserver-1.2.la \ - $(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \ - $(top_builddir)/addressbook/libebook/libebook-1.2.la \ - $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ - $(top_builddir)/calendar/libecal/libecal-1.2.la \ - $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \ - $(CAMEL_LIBS) $(E_DATA_SERVER_LIBS) $(E_BACKEND_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) $(EVOLUTION_CALENDAR_LIBS) - -GITIGNOREFILES = \ - $(DOC_MODULE)-overrides.txt \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).types \ - $(NULL) - -eds-cursor-example.sgml: eds-cursor-example.sgml.in - sed -e 's|\@SRCDIR\@|$(abs_top_srcdir)|g' $< > $(@) - -BUILT_SOURCES = eds-cursor-example.sgml -DISTCLEANFILES = $(BUILT_SOURCES) $(GITIGNOREFILES) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += version.xml.in $(HTML_IMAGE_SOURCE_FILES) eds-cursor-example.sgml.in - -CLEANFILES += $(BUILT_SOURCES) - -# Uncomment this to enable tests, currently we are still -# quite far from passing them -#TESTS = $(GTKDOC_CHECK) - --include $(top_srcdir)/git.mk diff --git a/docs/reference/eds/version.xml.in b/docs/reference/eds/version.xml.in deleted file mode 100644 index 10032a71a..000000000 --- a/docs/reference/eds/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@PACKAGE_STRING@
\ No newline at end of file diff --git a/docs/reference/evolution-data-server/CMakeLists.txt b/docs/reference/evolution-data-server/CMakeLists.txt new file mode 100644 index 000000000..c050c81f2 --- /dev/null +++ b/docs/reference/evolution-data-server/CMakeLists.txt @@ -0,0 +1,44 @@ +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/evolution-data-server-cursor-example.sgml.in + ${CMAKE_CURRENT_BINARY_DIR}/xml/evolution-data-server-cursor-example.sgml + @ONLY +) + +set(SOURCEDIRS + ${CMAKE_SOURCE_DIR}/libebackend + ${CMAKE_SOURCE_DIR}/libedataserver + ${CMAKE_BINARY_DIR}/libedataserver + ${CMAKE_SOURCE_DIR}/addressbook/libebook + ${CMAKE_SOURCE_DIR}/addressbook/libebook-contacts + ${CMAKE_SOURCE_DIR}/addressbook/libedata-book + ${CMAKE_SOURCE_DIR}/calendar/libecal + ${CMAKE_SOURCE_DIR}/calendar/libedata-cal + ${CMAKE_SOURCE_DIR}/tests/test-server-utils +) + +set(DEPENDENCIES + ebackend + edataserver + ebook + ebook-contacts + edata-book + ecal + edata-cal + etestserverutils +) + +set(IGNORE_HEADERS + e-alphabet-index-private.h + e-backend-enumtypes.h + e-book-enumtypes.h + e-book-contacts-enumtypes.h + e-cal-enumtypes.h + e-client-private.h + e-data-cal-types.h + e-phone-number-private.h + e-source-enumtypes.h + e-transliterator-private.h + libedataserver-private.h + ximian-vcard.h +) + +add_gtkdoc(evolution-data-server e "EDS_DISABLE_DEPRECATED" SOURCEDIRS DEPENDENCIES IGNORE_HEADERS) diff --git a/docs/reference/eds/eds-cursor-example.sgml.in b/docs/reference/evolution-data-server/evolution-data-server-cursor-example.sgml.in index a29e7b143..5cb83b1b3 100644 --- a/docs/reference/eds/eds-cursor-example.sgml.in +++ b/docs/reference/evolution-data-server/evolution-data-server-cursor-example.sgml.in @@ -70,7 +70,7 @@ <programlisting> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" - href="@SRCDIR@/examples/cursor/cursor-example.c"/> + href="@CMAKE_SOURCE_DIR@/examples/cursor/cursor-example.c"/> </programlisting> </informalexample> </refsect1> @@ -88,7 +88,7 @@ <programlisting> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" - href="@SRCDIR@/examples/cursor/cursor-navigator.c"/> + href="@CMAKE_SOURCE_DIR@/examples/cursor/cursor-navigator.c"/> </programlisting> </informalexample> </refsect1> @@ -106,7 +106,7 @@ <programlisting> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" - href="@SRCDIR@/examples/cursor/cursor-search.c"/> + href="@CMAKE_SOURCE_DIR@/examples/cursor/cursor-search.c"/> </programlisting> </informalexample> </refsect1> @@ -122,7 +122,7 @@ <programlisting> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" - href="@SRCDIR@/examples/cursor/cursor-slot.c"/> + href="@CMAKE_SOURCE_DIR@/examples/cursor/cursor-slot.c"/> </programlisting> </informalexample> </refsect1> @@ -139,7 +139,7 @@ <programlisting> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" - href="@SRCDIR@/examples/cursor/cursor-data.c"/> + href="@CMAKE_SOURCE_DIR@/examples/cursor/cursor-data.c"/> </programlisting> </informalexample> </refsect1> diff --git a/docs/reference/eds/eds-docs.sgml b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in index 8dcad263d..c3684db2c 100644 --- a/docs/reference/eds/eds-docs.sgml +++ b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in @@ -1,13 +1,12 @@ <?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> -<!ENTITY version SYSTEM "version.xml"> ]> <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> <title>Evolution-Data-Server Reference Manual</title> - <releaseinfo>Reference Manual for &version;</releaseinfo> + <releaseinfo>Reference Manual for @PACKAGE_VERSION@</releaseinfo> <abstract> <para> Evolution-Data-Server is a collection of libraries and services @@ -276,7 +275,7 @@ <part id="examples"> <title>Examples</title> - <xi:include href="xml/eds-cursor-example.sgml"/> + <xi:include href="xml/evolution-data-server-cursor-example.sgml"/> </part> <part id="unit-testing"> diff --git a/docs/reference/eds/image-sources/cursor-alphabetic-indexes.odg b/docs/reference/evolution-data-server/image-sources/cursor-alphabetic-indexes.odg Binary files differindex 7abc20418..7abc20418 100644 --- a/docs/reference/eds/image-sources/cursor-alphabetic-indexes.odg +++ b/docs/reference/evolution-data-server/image-sources/cursor-alphabetic-indexes.odg diff --git a/docs/reference/eds/image-sources/cursor-positions-filtered.odg b/docs/reference/evolution-data-server/image-sources/cursor-positions-filtered.odg Binary files differindex bc863cc92..bc863cc92 100644 --- a/docs/reference/eds/image-sources/cursor-positions-filtered.odg +++ b/docs/reference/evolution-data-server/image-sources/cursor-positions-filtered.odg diff --git a/docs/reference/eds/image-sources/cursor-positions-step.odg b/docs/reference/evolution-data-server/image-sources/cursor-positions-step.odg Binary files differindex a0306b63c..a0306b63c 100644 --- a/docs/reference/eds/image-sources/cursor-positions-step.odg +++ b/docs/reference/evolution-data-server/image-sources/cursor-positions-step.odg diff --git a/docs/reference/eds/image-sources/cursor-positions.odg b/docs/reference/evolution-data-server/image-sources/cursor-positions.odg Binary files differindex 059ef84ff..059ef84ff 100644 --- a/docs/reference/eds/image-sources/cursor-positions.odg +++ b/docs/reference/evolution-data-server/image-sources/cursor-positions.odg diff --git a/docs/reference/eds/images/cursor-alphabetic-indexes.png b/docs/reference/evolution-data-server/images/cursor-alphabetic-indexes.png Binary files differindex e58671427..e58671427 100644 --- a/docs/reference/eds/images/cursor-alphabetic-indexes.png +++ b/docs/reference/evolution-data-server/images/cursor-alphabetic-indexes.png diff --git a/docs/reference/eds/images/cursor-positions-filtered.png b/docs/reference/evolution-data-server/images/cursor-positions-filtered.png Binary files differindex 028dfed09..028dfed09 100644 --- a/docs/reference/eds/images/cursor-positions-filtered.png +++ b/docs/reference/evolution-data-server/images/cursor-positions-filtered.png diff --git a/docs/reference/eds/images/cursor-positions-step.png b/docs/reference/evolution-data-server/images/cursor-positions-step.png Binary files differindex 29f8718c1..29f8718c1 100644 --- a/docs/reference/eds/images/cursor-positions-step.png +++ b/docs/reference/evolution-data-server/images/cursor-positions-step.png diff --git a/docs/reference/eds/images/cursor-positions.png b/docs/reference/evolution-data-server/images/cursor-positions.png Binary files differindex eff780c27..eff780c27 100644 --- a/docs/reference/eds/images/cursor-positions.png +++ b/docs/reference/evolution-data-server/images/cursor-positions.png diff --git a/docs/reference/private/CMakeLists.txt b/docs/reference/private/CMakeLists.txt new file mode 100644 index 000000000..2825ce6d2 --- /dev/null +++ b/docs/reference/private/CMakeLists.txt @@ -0,0 +1,13 @@ +set(SOURCEDIRS + ${CMAKE_BINARY_DIR}/private +) + +set(DEPENDENCIES + edbus-private +) + +set(IGNORE_HEADERS + e-dbus-localed.h +) + +add_gtkdoc(libedbus-private e-dbus "EDS_DISABLE_DEPRECATED" SOURCEDIRS DEPENDENCIES IGNORE_HEADERS) diff --git a/docs/reference/private/Makefile.am b/docs/reference/private/Makefile.am deleted file mode 100644 index b2774ff25..000000000 --- a/docs/reference/private/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -NULL = - -# The name of the module. -DOC_MODULE = libedbus-private - -# The top-level SGML file. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED" --rebuild-sections --rebuild-types - -# The directory containing the source code. Relative to $(srcdir). -DOC_SOURCE_DIR = $(top_srcdir)/private - -# Used for dependencies. The docs will be rebuilt if any of these change. -HFILE_GLOB = $(top_builddir)/private/*.h -CFILE_GLOB = $(top_builddir)/private/*.c - -# Ignore interfaces from freedesktop.org. -IGNORE_HFILES = \ - e-dbus-localed.h \ - $(NULL) - -GTKDOC_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(E_DATA_SERVER_CFLAGS) \ - $(NULL) - -GTKDOC_LIBS = \ - $(top_builddir)/private/libedbus-private.la \ - $(E_DATA_SERVER_LIBS) \ - $(NULL) - -# Extra options to supply to gtkdoc-mkdb -# This is needed for cross-references to D-Bus interfaces to work. -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=e-dbus - -$(DOC_MAIN_SGML_FILE): $(DOC_MAIN_SGML_FILE).in - sed -e 's|\@SRCDIR\@|$(abs_top_builddir)|g' $< > $(@) - -GITIGNOREFILES = \ - $(DOC_MODULE)-overrides.txt \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).types \ - $(NULL) - -BUILT_SOURCES = $(DOC_MAIN_SGML_FILE) -DISTCLEANFILES = $(BUILT_SOURCES) $(GITIGNOREFILES) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -EXTRA_DIST += $(DOC_MAIN_SGML_FILE).in - -CLEANFILES += $(BUILT_SOURCES) - -#TESTS = $(GTKDOC_CHECK) - --include $(top_srcdir)/git.mk diff --git a/docs/reference/private/libedbus-private-docs.sgml.in b/docs/reference/private/libedbus-private-docs.sgml.in index 7d6999ec2..8052aa4be 100644 --- a/docs/reference/private/libedbus-private-docs.sgml.in +++ b/docs/reference/private/libedbus-private-docs.sgml.in @@ -5,7 +5,7 @@ ]> <book id="index" xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> - <title>Evolution-Data-Server Manual: Private</title> + <title>Evolution-Data-Server Manual: Private, version @PROJECT_VERSION@</title> </bookinfo> <chapter> @@ -25,19 +25,19 @@ <chapter> <title>D-Bus Interfaces</title> - <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.Removable.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.Writable.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteCreatable.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteDeletable.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.OAuth2Support.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-source-manager-org.gnome.evolution.dataserver.SourceManager.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-authenticator-org.gnome.evolution.dataserver.Authenticator.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-address-book-org.gnome.evolution.dataserver.AddressBook.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-address-book-factory-org.gnome.evolution.dataserver.AddressBookFactory.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-calendar-org.gnome.evolution.dataserver.Calendar.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-calendar-factory-org.gnome.evolution.dataserver.CalendarFactory.xml"/> - <xi:include href="@SRCDIR@/private/e-dbus-user-prompter-org.gnome.evolution.dataserver.UserPrompter.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.Removable.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.Writable.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteCreatable.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteDeletable.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.OAuth2Support.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-source-manager-org.gnome.evolution.dataserver.SourceManager.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-authenticator-org.gnome.evolution.dataserver.Authenticator.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-address-book-org.gnome.evolution.dataserver.AddressBook.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-address-book-factory-org.gnome.evolution.dataserver.AddressBookFactory.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-calendar-org.gnome.evolution.dataserver.Calendar.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-calendar-factory-org.gnome.evolution.dataserver.CalendarFactory.xml"/> + <xi:include href="@CMAKE_BINARY_DIR@/private/e-dbus-user-prompter-org.gnome.evolution.dataserver.UserPrompter.xml"/> </chapter> <index id="api-index-full"> |
