fix up the glib-genmarshal stuff

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* atk/Makefile.am ($(srcdir)/atkmarshal.c): fix up the
	glib-genmarshal stuff

diff --git a/ChangeLog b/ChangeLog
index 6e0f3f3..43aa6b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
+       * atk/Makefile.am ($(srcdir)/atkmarshal.c): fix up the
+       glib-genmarshal stuff
+
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
        * atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled
        glib-genmarshal
 

diff --git a/atk/Makefile.am b/atk/Makefile.am
index f882687..d0acc10 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -69,16 +69,22 @@ atk.defs atkmarshal.h :       # never add deps here
        test -f "$(srcdir)/$@" || touch $(srcdir)/$@
 
 $(srcdir)/stamp-atkmarshal.h: @REBUILD@ atkmarshal.list atkmarshal.h
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_GENMARSHAL@ --prefix=atk_marshal atkmarshal.list --header >> xgen-gmh \
-       && (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h) \
-       && rm -f xgen-gmh xgen-gmh~ \
+        case @GLIB_GENMARSHAL@ in                                                      \
+           /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                    \
+            *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;                \
+        esac;                                                                          \
+       cd $(srcdir)                                                                    \
+       && $$glib_genmarshal --prefix=atk_marshal atkmarshal.list --header >> xgen-gmh  \
+       && (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h)                   \
+       && rm -f xgen-gmh xgen-gmh~                                                     \
        && echo timestamp > $(@F)
+
 $(srcdir)/atkmarshal.c: @REBUILD@ $(srcdir)/stamp-atkmarshal.h
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_GENMARSHAL@ --prefix=atk_marshal atkmarshal.list --body >> xgen-gmc \
-       && cp xgen-gmc atkmarshal.c \
+        case @GLIB_GENMARSHAL@ in                                                      \
+           /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                    \
+            *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;                \
+        esac;                                                                          \
+       cd $(srcdir)                                                                    \
+       && $$glib_genmarshal --prefix=atk_marshal atkmarshal.list --body >> xgen-gmc    \
+       && cp xgen-gmc atkmarshal.c                                                     \
        && rm -f xgen-gmc xgen-gmc~
-

diff --git a/docs/tmpl/atk-unused.sgml b/docs/tmpl/atk-unused.sgml
index 8c21a6d..642b4ac 100644 (file)
--- a/docs/tmpl/atk-unused.sgml
+++ b/docs/tmpl/atk-unused.sgml
@@ -74,6 +74,17 @@ atk
 @start_offset: 
 @end_offset: 
 
+<!-- ##### FUNCTION atk_text_ref_run_attributes ##### -->
+<para>
+
+</para>
+
+@text: 
+@offset: 
+@start_offset: 
+@end_offset: 
+@Returns: 
+
 <!-- ##### FUNCTION atk_text_set_selection_bounds ##### -->
 <para>