GNOME.org
 

[glib] Move gdbus-codegen example code and docs into separate directories

commit 723adbc2feb72b980b6a62579eaa993b190ca1d3
Author: David Zeuthen <davidz redhat com>
Date:   Fri Jun 3 13:22:31 2011 -0400

    Move gdbus-codegen example code and docs into separate directories
    
    This avoids the generated types (e.g. ExampleAnimal, ExampleCat,
    ExampleObject and ExampleObjectManagerClient) being referenced in the
    core gio docs. This was requested by Matthias.
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 configure.ac                                       |    2 +
 docs/reference/gio/Makefile.am                     |    3 +-
 .../gio/gdbus-object-manager-example/Makefile.am   |   68 +++++++++
 .../gdbus-object-manager-example-docs.xml          |   17 ++
 .../gdbus-object-manager-example-sections.txt      |  157 +++++++++++++++++++
 .../gdbus-object-manager-example.types             |   10 ++
 docs/reference/gio/gio-sections.txt                |  158 --------------------
 docs/reference/gio/gio.types                       |   10 --
 docs/reference/gio/migrating-gdbus.xml             |   12 +-
 gio/Makefile.am                                    |   28 ----
 gio/tests/Makefile.am                              |    8 +-
 gio/tests/gdbus-object-manager-example/Makefile.am |   48 ++++++
 .../gdbus-example-objectmanager.xml                |    0
 13 files changed, 316 insertions(+), 205 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ee56df3..79d2b0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3784,6 +3784,7 @@ gio/fen/Makefile
 gio/fam/Makefile
 gio/win32/Makefile
 gio/tests/Makefile
+gio/tests/gdbus-object-manager-example/Makefile
 po/Makefile.in
 docs/Makefile
 docs/reference/Makefile
@@ -3792,6 +3793,7 @@ docs/reference/glib/version.xml
 docs/reference/gobject/Makefile
 docs/reference/gobject/version.xml
 docs/reference/gio/Makefile
+docs/reference/gio/gdbus-object-manager-example/Makefile
 docs/reference/gio/version.xml
 tests/Makefile
 tests/gobject/Makefile
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 30de059..a2b0842 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -1,6 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
+SUBDIRS = gdbus-object-manager-example
+
 # The name of the module.
 DOC_MODULE=gio
 
@@ -128,7 +130,6 @@ GTKDOC_LIBS = \
 	$(top_builddir)/gobject/libgobject-2.0.la	\
 	$(top_builddir)/gmodule/libgmodule-2.0.la	\
 	$(top_builddir)/gio/libgio-2.0.la		\
-	$(top_builddir)/gio/libgdbus-example-objectmanager.la \
 	$(NULL)
 
 # Extra options to supply to gtkdoc-mkdb
diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
new file mode 100644
index 0000000..9750e52
--- /dev/null
+++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
@@ -0,0 +1,68 @@
+include $(top_srcdir)/Makefile.decl
+NULL =
+
+# The name of the module.
+DOC_MODULE=gdbus-object-manager-example
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml
+
+# Extra options to supply to gtkdoc-scan
+SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
+
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example
+
+HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
+CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
+
+# Headers to ignore
+IGNORE_HFILES=				\
+	$(NULL)
+
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+INCLUDES = \
+	$(gio_INCLUDES)			\
+	$(GLIB_DEBUG_FLAGS)
+
+GTKDOC_LIBS = \
+	$(top_builddir)/glib/libglib-2.0.la		\
+	$(top_builddir)/gobject/libgobject-2.0.la	\
+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
+	$(top_builddir)/gio/libgio-2.0.la		\
+	$(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \
+	$(NULL)
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
+	$(NULL)
+
+# Images to copy into HTML directory
+HTML_IMAGES =			\
+	$(NULL)
+
+content_files =			\
+	$(NULL)
+
+expand_content_files =		\
+	$(NULL)
+
+extra_files =			\
+	$(NULL)
+
+include $(top_srcdir)/gtk-doc.make
+
+EXTRA_DIST +=			\
+	$(NULL)
+
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
+dist-hook-local: gdbus-object-manager-example-docs-clean all-local
+
+gdbus-object-manager-example-docs-clean: clean
+	cd $(srcdir) && rm -rf xml html
+
+# Nuke installed docs (don't know how to avoid installing them)
+install-data-hook :
+	rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
diff --git a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-docs.xml b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-docs.xml
new file mode 100644
index 0000000..1350812
--- /dev/null
+++ b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-docs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!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'">
+]>
+<book lang="en" xmlns:xi="http://www.w3.org/2003/XInclude";>
+  <part>
+    <title>foo</title>
+    <chapter>
+      <title>bar</title>
+      <xi:include href="xml/ExampleAnimal.xml"/>
+      <xi:include href="xml/ExampleCat.xml"/>
+      <xi:include href="xml/ExampleObject.xml"/>
+      <xi:include href="xml/ExampleObjectManagerClient.xml"/>
+    </chapter>
+  </part>
+</book>
diff --git a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-sections.txt b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-sections.txt
new file mode 100644
index 0000000..97207e8
--- /dev/null
+++ b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-sections.txt
@@ -0,0 +1,157 @@
+<SECTION>
+<FILE>ExampleAnimal</FILE>
+<TITLE>ExampleAnimal</TITLE>
+ExampleAnimal
+ExampleAnimalIface
+example_animal_interface_info
+example_animal_override_properties
+example_animal_call_poke
+example_animal_call_poke_finish
+example_animal_call_poke_sync
+example_animal_complete_poke
+example_animal_emit_jumped
+example_animal_get_mood
+example_animal_set_mood
+ExampleAnimalProxy
+ExampleAnimalProxyClass
+example_animal_proxy_new
+example_animal_proxy_new_finish
+example_animal_proxy_new_sync
+example_animal_proxy_new_for_bus
+example_animal_proxy_new_for_bus_finish
+example_animal_proxy_new_for_bus_sync
+ExampleAnimalSkeleton
+ExampleAnimalSkeletonClass
+example_animal_skeleton_new
+<SUBSECTION Standard>
+example_animal_get_type
+example_animal_proxy_get_type
+example_animal_skeleton_get_type
+ExampleAnimalSkeletonPrivate
+ExampleAnimalProxyPrivate
+EXAMPLE_TYPE_ANIMAL
+EXAMPLE_TYPE_ANIMAL_PROXY
+EXAMPLE_TYPE_ANIMAL_SKELETON
+EXAMPLE_ANIMAL
+EXAMPLE_ANIMAL_GET_IFACE
+EXAMPLE_ANIMAL_PROXY
+EXAMPLE_ANIMAL_PROXY_CLASS
+EXAMPLE_ANIMAL_PROXY_GET_CLASS
+EXAMPLE_ANIMAL_SKELETON
+EXAMPLE_ANIMAL_SKELETON_CLASS
+EXAMPLE_ANIMAL_SKELETON_GET_CLASS
+EXAMPLE_PEEK_ANIMAL
+EXAMPLE_GET_ANIMAL
+EXAMPLE_IS_ANIMAL
+EXAMPLE_IS_ANIMAL_PROXY
+EXAMPLE_IS_ANIMAL_PROXY_CLASS
+EXAMPLE_IS_ANIMAL_SKELETON
+EXAMPLE_IS_ANIMAL_SKELETON_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>ExampleCat</FILE>
+<TITLE>ExampleCat</TITLE>
+ExampleCat
+ExampleCatIface
+example_cat_interface_info
+ExampleCatProxy
+ExampleCatProxyClass
+example_cat_proxy_new
+example_cat_proxy_new_finish
+example_cat_proxy_new_sync
+example_cat_proxy_new_for_bus
+example_cat_proxy_new_for_bus_finish
+example_cat_proxy_new_for_bus_sync
+ExampleCatSkeleton
+ExampleCatSkeletonClass
+example_cat_skeleton_new
+<SUBSECTION Standard>
+example_cat_get_type
+example_cat_proxy_get_type
+example_cat_skeleton_get_type
+ExampleCatProxyPrivate
+ExampleCatSkeletonPrivate
+EXAMPLE_TYPE_CAT
+EXAMPLE_TYPE_CAT_PROXY
+EXAMPLE_TYPE_CAT_SKELETON
+EXAMPLE_CAT
+EXAMPLE_CAT_GET_IFACE
+EXAMPLE_CAT_PROXY
+EXAMPLE_CAT_PROXY_CLASS
+EXAMPLE_CAT_PROXY_GET_CLASS
+EXAMPLE_CAT_SKELETON
+EXAMPLE_CAT_SKELETON_CLASS
+EXAMPLE_CAT_SKELETON_GET_CLASS
+EXAMPLE_PEEK_CAT
+EXAMPLE_GET_CAT
+EXAMPLE_IS_CAT
+EXAMPLE_IS_CAT_PROXY
+EXAMPLE_IS_CAT_PROXY_CLASS
+EXAMPLE_IS_CAT_SKELETON
+EXAMPLE_IS_CAT_SKELETON_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>ExampleObject</FILE>
+<TITLE>ExampleObject</TITLE>
+ExampleObject
+ExampleObjectIface
+example_object_get_animal
+example_object_get_cat
+example_object_peek_animal
+example_object_peek_cat
+ExampleObjectProxy
+ExampleObjectProxyClass
+example_object_proxy_new
+ExampleObjectSkeleton
+ExampleObjectSkeletonClass
+example_object_skeleton_new
+example_object_skeleton_set_animal
+example_object_skeleton_set_cat
+<SUBSECTION Standard>
+example_object_get_type
+example_object_proxy_get_type
+example_object_skeleton_get_type
+ExampleObjectProxyPrivate
+ExampleObjectSkeletonPrivate
+EXAMPLE_IS_OBJECT
+EXAMPLE_IS_OBJECT_PROXY
+EXAMPLE_IS_OBJECT_PROXY_CLASS
+EXAMPLE_IS_OBJECT_SKELETON
+EXAMPLE_IS_OBJECT_SKELETON_CLASS
+EXAMPLE_OBJECT
+EXAMPLE_OBJECT_GET_IFACE
+EXAMPLE_OBJECT_PROXY
+EXAMPLE_OBJECT_PROXY_CLASS
+EXAMPLE_OBJECT_PROXY_GET_CLASS
+EXAMPLE_OBJECT_SKELETON
+EXAMPLE_OBJECT_SKELETON_CLASS
+EXAMPLE_OBJECT_SKELETON_GET_CLASS
+EXAMPLE_TYPE_OBJECT
+EXAMPLE_TYPE_OBJECT_PROXY
+EXAMPLE_TYPE_OBJECT_SKELETON
+</SECTION>
+
+<SECTION>
+<FILE>ExampleObjectManagerClient</FILE>
+<TITLE>ExampleObjectManagerClient</TITLE>
+ExampleObjectManagerClient
+ExampleObjectManagerClientClass
+example_object_manager_client_get_proxy_type
+example_object_manager_client_new
+example_object_manager_client_new_finish
+example_object_manager_client_new_sync
+example_object_manager_client_new_for_bus
+example_object_manager_client_new_for_bus_finish
+example_object_manager_client_new_for_bus_sync
+<SUBSECTION Standard>
+example_object_manager_client_get_type
+EXAMPLE_IS_OBJECT_MANAGER_CLIENT
+EXAMPLE_IS_OBJECT_MANAGER_CLIENT_CLASS
+EXAMPLE_OBJECT_MANAGER_CLIENT
+EXAMPLE_OBJECT_MANAGER_CLIENT_CLASS
+EXAMPLE_OBJECT_MANAGER_CLIENT_GET_CLASS
+EXAMPLE_TYPE_OBJECT_MANAGER_CLIENT
+ExampleObjectManagerClientPrivate
+</SECTION>
diff --git a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types
new file mode 100644
index 0000000..af1dfee
--- /dev/null
+++ b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types
@@ -0,0 +1,10 @@
+example_object_get_type
+example_object_proxy_get_type
+example_object_skeleton_get_type
+example_animal_get_type
+example_animal_proxy_get_type
+example_animal_skeleton_get_type
+example_cat_get_type
+example_cat_proxy_get_type
+example_cat_skeleton_get_type
+example_object_manager_client_get_type
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index cacd012..1a8cd5b 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -3310,161 +3310,3 @@ G_DBUS_OBJECT_MANAGER_SERVER_GET_CLASS
 <SUBSECTION Private>
 GDBusObjectManagerServerPrivate
 </SECTION>
-
-<SECTION>
-<FILE>ExampleAnimal</FILE>
-<TITLE>ExampleAnimal</TITLE>
-ExampleAnimal
-ExampleAnimalIface
-example_animal_interface_info
-example_animal_override_properties
-example_animal_call_poke
-example_animal_call_poke_finish
-example_animal_call_poke_sync
-example_animal_complete_poke
-example_animal_emit_jumped
-example_animal_get_mood
-example_animal_set_mood
-ExampleAnimalProxy
-ExampleAnimalProxyClass
-example_animal_proxy_new
-example_animal_proxy_new_finish
-example_animal_proxy_new_sync
-example_animal_proxy_new_for_bus
-example_animal_proxy_new_for_bus_finish
-example_animal_proxy_new_for_bus_sync
-ExampleAnimalSkeleton
-ExampleAnimalSkeletonClass
-example_animal_skeleton_new
-<SUBSECTION Standard>
-example_animal_get_type
-example_animal_proxy_get_type
-example_animal_skeleton_get_type
-ExampleAnimalSkeletonPrivate
-ExampleAnimalProxyPrivate
-EXAMPLE_TYPE_ANIMAL
-EXAMPLE_TYPE_ANIMAL_PROXY
-EXAMPLE_TYPE_ANIMAL_SKELETON
-EXAMPLE_ANIMAL
-EXAMPLE_ANIMAL_GET_IFACE
-EXAMPLE_ANIMAL_PROXY
-EXAMPLE_ANIMAL_PROXY_CLASS
-EXAMPLE_ANIMAL_PROXY_GET_CLASS
-EXAMPLE_ANIMAL_SKELETON
-EXAMPLE_ANIMAL_SKELETON_CLASS
-EXAMPLE_ANIMAL_SKELETON_GET_CLASS
-EXAMPLE_PEEK_ANIMAL
-EXAMPLE_GET_ANIMAL
-EXAMPLE_IS_ANIMAL
-EXAMPLE_IS_ANIMAL_PROXY
-EXAMPLE_IS_ANIMAL_PROXY_CLASS
-EXAMPLE_IS_ANIMAL_SKELETON
-EXAMPLE_IS_ANIMAL_SKELETON_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>ExampleCat</FILE>
-<TITLE>ExampleCat</TITLE>
-ExampleCat
-ExampleCatIface
-example_cat_interface_info
-ExampleCatProxy
-ExampleCatProxyClass
-example_cat_proxy_new
-example_cat_proxy_new_finish
-example_cat_proxy_new_sync
-example_cat_proxy_new_for_bus
-example_cat_proxy_new_for_bus_finish
-example_cat_proxy_new_for_bus_sync
-ExampleCatSkeleton
-ExampleCatSkeletonClass
-example_cat_skeleton_new
-<SUBSECTION Standard>
-example_cat_get_type
-example_cat_proxy_get_type
-example_cat_skeleton_get_type
-ExampleCatProxyPrivate
-ExampleCatSkeletonPrivate
-EXAMPLE_TYPE_CAT
-EXAMPLE_TYPE_CAT_PROXY
-EXAMPLE_TYPE_CAT_SKELETON
-EXAMPLE_CAT
-EXAMPLE_CAT_GET_IFACE
-EXAMPLE_CAT_PROXY
-EXAMPLE_CAT_PROXY_CLASS
-EXAMPLE_CAT_PROXY_GET_CLASS
-EXAMPLE_CAT_SKELETON
-EXAMPLE_CAT_SKELETON_CLASS
-EXAMPLE_CAT_SKELETON_GET_CLASS
-EXAMPLE_PEEK_CAT
-EXAMPLE_GET_CAT
-EXAMPLE_IS_CAT
-EXAMPLE_IS_CAT_PROXY
-EXAMPLE_IS_CAT_PROXY_CLASS
-EXAMPLE_IS_CAT_SKELETON
-EXAMPLE_IS_CAT_SKELETON_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>ExampleObject</FILE>
-<TITLE>ExampleObject</TITLE>
-ExampleObject
-ExampleObjectIface
-example_object_get_animal
-example_object_get_cat
-example_object_peek_animal
-example_object_peek_cat
-ExampleObjectProxy
-ExampleObjectProxyClass
-example_object_proxy_new
-ExampleObjectSkeleton
-ExampleObjectSkeletonClass
-example_object_skeleton_new
-example_object_skeleton_set_animal
-example_object_skeleton_set_cat
-<SUBSECTION Standard>
-example_object_get_type
-example_object_proxy_get_type
-example_object_skeleton_get_type
-ExampleObjectProxyPrivate
-ExampleObjectSkeletonPrivate
-EXAMPLE_IS_OBJECT
-EXAMPLE_IS_OBJECT_PROXY
-EXAMPLE_IS_OBJECT_PROXY_CLASS
-EXAMPLE_IS_OBJECT_SKELETON
-EXAMPLE_IS_OBJECT_SKELETON_CLASS
-EXAMPLE_OBJECT
-EXAMPLE_OBJECT_GET_IFACE
-EXAMPLE_OBJECT_PROXY
-EXAMPLE_OBJECT_PROXY_CLASS
-EXAMPLE_OBJECT_PROXY_GET_CLASS
-EXAMPLE_OBJECT_SKELETON
-EXAMPLE_OBJECT_SKELETON_CLASS
-EXAMPLE_OBJECT_SKELETON_GET_CLASS
-EXAMPLE_TYPE_OBJECT
-EXAMPLE_TYPE_OBJECT_PROXY
-EXAMPLE_TYPE_OBJECT_SKELETON
-</SECTION>
-
-<SECTION>
-<FILE>ExampleObjectManagerClient</FILE>
-<TITLE>ExampleObjectManagerClient</TITLE>
-ExampleObjectManagerClient
-ExampleObjectManagerClientClass
-example_object_manager_client_get_proxy_type
-example_object_manager_client_new
-example_object_manager_client_new_finish
-example_object_manager_client_new_sync
-example_object_manager_client_new_for_bus
-example_object_manager_client_new_for_bus_finish
-example_object_manager_client_new_for_bus_sync
-<SUBSECTION Standard>
-example_object_manager_client_get_type
-EXAMPLE_IS_OBJECT_MANAGER_CLIENT
-EXAMPLE_IS_OBJECT_MANAGER_CLIENT_CLASS
-EXAMPLE_OBJECT_MANAGER_CLIENT
-EXAMPLE_OBJECT_MANAGER_CLIENT_CLASS
-EXAMPLE_OBJECT_MANAGER_CLIENT_GET_CLASS
-EXAMPLE_TYPE_OBJECT_MANAGER_CLIENT
-ExampleObjectManagerClientPrivate
-</SECTION>
diff --git a/docs/reference/gio/gio.types b/docs/reference/gio/gio.types
index 4938012..3a798f3 100644
--- a/docs/reference/gio/gio.types
+++ b/docs/reference/gio/gio.types
@@ -1,13 +1,3 @@
-example_object_get_type
-example_object_proxy_get_type
-example_object_skeleton_get_type
-example_animal_get_type
-example_animal_proxy_get_type
-example_animal_skeleton_get_type
-example_cat_get_type
-example_cat_proxy_get_type
-example_cat_skeleton_get_type
-example_object_manager_client_get_type
 g_action_get_type
 g_simple_action_get_type
 g_action_group_get_type
diff --git a/docs/reference/gio/migrating-gdbus.xml b/docs/reference/gio/migrating-gdbus.xml
index de6754c..00a673f 100644
--- a/docs/reference/gio/migrating-gdbus.xml
+++ b/docs/reference/gio/migrating-gdbus.xml
@@ -293,12 +293,12 @@ gdbus-codegen --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
 
   </section>
 
-  <xi:include href="../../../../gio/gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml"/>
-  <xi:include href="../../../../gio/gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml"/>
-  <xi:include href="ExampleAnimal.xml"/>
-  <xi:include href="ExampleCat.xml"/>
-  <xi:include href="ExampleObject.xml"/>
-  <xi:include href="ExampleObjectManagerClient.xml"/>
+  <xi:include href="../../../../gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml"/>
+  <xi:include href="../../../../gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml"/>
+  <xi:include href="../gdbus-object-manager-example/xml/ExampleAnimal.xml"/>
+  <xi:include href="../gdbus-object-manager-example/xml/ExampleCat.xml"/>
+  <xi:include href="../gdbus-object-manager-example/xml/ExampleObject.xml"/>
+  <xi:include href="../gdbus-object-manager-example/xml/ExampleObjectManagerClient.xml"/>
 
   </section>
 
diff --git a/gio/Makefile.am b/gio/Makefile.am
index bc90cc5..32ad95a 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -651,34 +651,6 @@ completion_SCRIPTS = \
 EXTRA_DIST += $(completion_SCRIPTS)
 
 # ------------------------------------------------------------------------
-# generate code here for the sake of gtk-doc
-
-gdbus-example-objectmanager-generated.h gdbus-example-objectmanager-generated.c : gdbus-example-objectmanager.xml
-	$(AM_V_GEN) $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py	 	\
-		--interface-prefix org.gtk.GDBus.Example.ObjectManager.		\
-		--c-namespace Example 						\
-		--c-generate-object-manager					\
-		--generate-c-code gdbus-example-objectmanager-generated		\
-		--generate-docbook gdbus-example-objectmanager-generated	\
-		gdbus-example-objectmanager.xml					\
-		$(NULL)
-
-BUILT_SOURCES += gdbus-example-objectmanager-generated.h gdbus-example-objectmanager-generated.c
-
-noinst_LTLIBRARIES = libgdbus-example-objectmanager.la
-libgdbus_example_objectmanager_la_SOURCES  = gdbus-example-objectmanager-generated.h gdbus-example-objectmanager-generated.c
-libgdbus_example_objectmanager_la_LIBADD   = 		\
-	$(top_builddir)/glib/libglib-2.0.la		\
-	$(top_builddir)/gobject/libgobject-2.0.la	\
-	$(top_builddir)/gmodule/libgmodule-2.0.la	\
-	libgio-2.0.la					\
-	$(NULL)
-
-EXTRA_DIST += gdbus-example-objectmanager.xml
-
-CLEANFILES += gdbus-example-objectmanager-generated-*.xml
-
-# ------------------------------------------------------------------------
 
 dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters
 	files='$(BUILT_EXTRA_DIST)'; \
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index c4642c5..bc2ca18 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -3,6 +3,8 @@ BUILT_SOURCES =
 
 include $(top_srcdir)/Makefile.decl
 
+SUBDIRS = gdbus-object-manager-example
+
 INCLUDES = 			\
 	-g 			\
 	$(gio_INCLUDES)		\
@@ -445,10 +447,12 @@ proxy_LDADD   = $(progs_ldadd) \
 # -----------------------------------------------------------------------------
 
 gdbus_example_objectmanager_server_SOURCES  = gdbus-example-objectmanager-server.c
-gdbus_example_objectmanager_server_LDADD    = $(top_builddir)/gio/libgdbus-example-objectmanager.la $(progs_ldadd)
+gdbus_example_objectmanager_server_CFLAGS   = -I$(top_builddir)/gio/tests/gdbus-object-manager-example
+gdbus_example_objectmanager_server_LDADD    = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd)
 
 gdbus_example_objectmanager_client_SOURCES  = gdbus-example-objectmanager-client.c
-gdbus_example_objectmanager_client_LDADD    = $(top_builddir)/gio/libgdbus-example-objectmanager.la $(progs_ldadd)
+gdbus_example_objectmanager_client_CFLAGS   = -I$(top_builddir)/gio/tests/gdbus-object-manager-example
+gdbus_example_objectmanager_client_LDADD    = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd)
 
 # -----------------------------------------------------------------------------
 
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
new file mode 100644
index 0000000..3e4269c
--- /dev/null
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -0,0 +1,48 @@
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES = 			\
+	-g 			\
+	$(gio_INCLUDES)		\
+	$(GLIB_DEBUG_FLAGS)	\
+	-I$(top_builddir)/gio	\
+	-I$(top_srcdir)/gio	\
+	-DSRCDIR=\""$(srcdir)"\"
+
+# ------------------------------------------------------------------------
+
+GDBUS_GENERATED = 										\
+	gdbus-example-objectmanager-generated.h 						\
+	gdbus-example-objectmanager-generated.c 						\
+	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml    \
+	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml 	\
+	$(NULL)
+
+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
+	$(AM_V_GEN) $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py	 	\
+		--interface-prefix org.gtk.GDBus.Example.ObjectManager.		\
+		--c-namespace Example 						\
+		--c-generate-object-manager					\
+		--generate-c-code gdbus-example-objectmanager-generated		\
+		--generate-docbook gdbus-example-objectmanager-generated	\
+		gdbus-example-objectmanager.xml					\
+		$(NULL)
+
+BUILT_SOURCES += $(GDBUS_GENERATED)
+
+noinst_LTLIBRARIES = libgdbus-example-objectmanager.la
+libgdbus_example_objectmanager_la_SOURCES  = gdbus-example-objectmanager-generated.h gdbus-example-objectmanager-generated.c
+libgdbus_example_objectmanager_la_LIBADD   = 		\
+	$(top_builddir)/glib/libglib-2.0.la		\
+	$(top_builddir)/gobject/libgobject-2.0.la	\
+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
+	$(top_builddir)/gio/libgio-2.0.la		\
+	$(NULL)
+
+EXTRA_DIST += gdbus-example-objectmanager.xml
+
+CLEANFILES += $(GDBUS_GENERATED)
+
diff --git a/gio/gdbus-example-objectmanager.xml b/gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager.xml
similarity index 100%
rename from gio/gdbus-example-objectmanager.xml
rename to gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]