Removed... ...and readded. Change to the standard file extension for

Mon Oct 20 20:38:06 2003  Matthias Clasen  <maclas@gmx.de>

	* gobject/gobject.i: Removed...
	* gobject/gobject.cI: ...and readded.
	* gobject/gobject.types: Change to the standard file
	extension for included hunks of C code.

Mon Oct 20 20:34:33 2003  Matthias Clasen  <maclas@gmx.de>

	* gobject/Makefile.am (INCLUDES): Add $(top_builddir)/glib
	as an include dir again, this time for real.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e3d5e70f980820f2e6b8dad14d1d922431a4de96..83299fb0b83d845319b1fef3d4253e851b7e23b4 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,15 @@
+Mon Oct 20 20:38:06 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gobject/gobject.i: Removed...
+       * gobject/gobject.cI: ...and readded.
+       * gobject/gobject.types: Change to the standard file 
+       extension for included hunks of C code.
+
+Mon Oct 20 20:34:33 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gobject/Makefile.am (INCLUDES): Add $(top_builddir)/glib
+       as an include dir again, this time for real.  
+
 Mon Oct 20 01:12:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gobject/tmpl/gtype.sgml: 

diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index 909fc18cb7230bf78bb922c2168019259c601120..8f0f4215cb008d35d77a6fdcb80c2afa21cd5451 100644 (file)
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -20,6 +20,7 @@ CFILE_GLOB=$(top_srcdir)/gobject/*.c
 INCLUDES = \
        -I$(top_srcdir)                 \
        -I$(top_builddir)               \
+       -I$(top_builddir)/glib          \
        $(GLIB_DEBUG_FLAGS)
 GTKDOC_LIBS = \
        $(top_builddir)/glib/libglib-2.0.la     \

diff --git a/docs/reference/gobject/gobject.cI b/docs/reference/gobject/gobject.cI
new file mode 100644 (file)
index 0000000..2976940
--- /dev/null
+++ b/docs/reference/gobject/gobject.cI
@@ -0,0 +1,11 @@
+/*
+ * This is a hack to work around a limitation of gtkdoc-scan: it insists
+ * on putting () behind every symbol listed in gobject.types. Thus we
+ * can't put G_TYPE_OBJECT there, but have to sneak a g_object_get_type()
+ * function in the generated source via an #include.
+ */
+GType 
+g_object_get_type (void)
+{
+  return G_TYPE_OBJECT;
+}

diff --git a/docs/reference/gobject/gobject.i b/docs/reference/gobject/gobject.i
deleted file mode 100644 (file)
index 2976940..0000000
--- a/docs/reference/gobject/gobject.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This is a hack to work around a limitation of gtkdoc-scan: it insists
- * on putting () behind every symbol listed in gobject.types. Thus we
- * can't put G_TYPE_OBJECT there, but have to sneak a g_object_get_type()
- * function in the generated source via an #include.
- */
-GType 
-g_object_get_type (void)
-{
-  return G_TYPE_OBJECT;
-}

diff --git a/docs/reference/gobject/gobject.types b/docs/reference/gobject/gobject.types
index 40f079ce7b5884fb475f8df593734f177a8be53f..b8d745f469ad3a1877612943c1f29bd094533d0f 100644 (file)
--- a/docs/reference/gobject/gobject.types
+++ b/docs/reference/gobject/gobject.types
@@ -1,5 +1,5 @@
 #include <glib/glib-object.h>
-#include "gobject.i"
+#include "gobject.cI"
 
 g_object_get_type
 g_type_module_get_type