Add $(top_builddir) to includes as necessary, Run gtkdoc-scangobj from

Fri Apr 13 10:41:10 2001  Owen Taylor  <otaylor@redhat.com>

        * */Makefile.am: Add $(top_builddir) to includes as necessary,
        Run gtkdoc-scangobj from builddir, not srcdir, don't distribute
        foo-doc.{top,bottom}, recomment in code to distribute HTML
        images, with shell fixes.

        * gtk/gtk.hierarchy gdk-pixbuf/gdk-pixbuf.{args,signals,hierarchy}:
        Remove generated files.

11 files changed, 60 insertions, 188 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0cc837c87b..f4d55e115f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,13 @@
+Fri Apr 13 10:41:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* */Makefile.am: Add $(top_builddir) to includes as necessary,
+	Run gtkdoc-scangobj from builddir, not srcdir, don't distribute
+	foo-doc.{top,bottom}, recomment in code to distribute HTML
+	images, with shell fixes.
+
+	* gtk/gtk.hierarchy gdk-pixbuf/gdk-pixbuf.{args,signals,hierarchy}:
+	Remove generated files.
+	
 Wed Apr  4 01:26:04 2001  Tim Janik  <timj@gtk.org>
 
         * gdk-pixbuf/Makefile.am: disabled "for i in $(HTML_IMAGES) ;"
diff --git a/docs/reference/gdk-pixbuf/.cvsignore b/docs/reference/gdk-pixbuf/.cvsignore
index 2aea74f5d1..d418a9eeb1 100644
--- a/docs/reference/gdk-pixbuf/.cvsignore
+++ b/docs/reference/gdk-pixbuf/.cvsignore
@@ -2,6 +2,12 @@ Makefile
 Makefile.in
 html
 sgml
+gdk-pixbuf.args
+gdk-pixbuf.hierarchy
+gdk-pixbuf.signals
 gdk-pixbuf-decl.txt
 gdk-pixbuf-decl-list.txt
 gdk-pixbuf-unused.txt
+*.stamp
+*.lo
+.libs
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 140f25630c..dd307d3cf1 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -50,6 +50,7 @@ extra_files =
 GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
 	@CFLAGS@					\
 	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
 	-I$(top_builddir)/gdk				\
 	-DGTK_DISABLE_COMPAT_H				\
 	@GTK_DEBUG_FLAGS@				\
@@ -107,14 +108,14 @@ all-local: html-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
-	cd $(srcdir) && ( \
-	if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
+	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
-	fi )
+	fi
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	touch scan-build.stamp
@@ -134,7 +135,7 @@ tmpl.stamp: tmpl-build.stamp
 
 #### sgml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
 	@echo '*** Building SGML ***'
 	cd $(srcdir) && \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
@@ -194,12 +195,12 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
 	-cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
 
-#	for i in $(HTML_IMAGES) ; do          \
-#	  cp $(srcdir)/$$i $(distdir)/html ;  \
-#	done
+	images=$(HTML_IMAGES) ;    	      \
+	for i in $$images ; do		      \
+	  cp $(srcdir)/$$i $(distdir)/html ;  \
+	done
 
 .PHONY : dist-hook-local
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy b/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy
deleted file mode 100644
index 65da5aa3ab..0000000000
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy
+++ /dev/null
@@ -1,8 +0,0 @@
-GObject
-  GdkDrawable
-    GdkWindow
-    GdkDrawableImplX11
-      GdkWindowImplX11
-  GdkColormap
-  GtkSettings
-  GdkPixbufLoader
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.signals b/docs/reference/gdk-pixbuf/gdk-pixbuf.signals
deleted file mode 100644
index 252ed60d48..0000000000
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.signals
+++ /dev/null
@@ -1,35 +0,0 @@
-<SIGNAL>
-<NAME>GdkPixbufLoader::animation-done</NAME>
-<RETURNS>void</RETURNS>
-GdkPixbufLoader *gdkpixbufloader
-</SIGNAL>
-
-<SIGNAL>
-<NAME>GdkPixbufLoader::area-prepared</NAME>
-<RETURNS>void</RETURNS>
-GdkPixbufLoader *gdkpixbufloader
-</SIGNAL>
-
-<SIGNAL>
-<NAME>GdkPixbufLoader::area-updated</NAME>
-<RETURNS>void</RETURNS>
-GdkPixbufLoader *gdkpixbufloader
-gint  arg1
-gint  arg2
-gint  arg3
-gint  arg4
-</SIGNAL>
-
-<SIGNAL>
-<NAME>GdkPixbufLoader::closed</NAME>
-<RETURNS>void</RETURNS>
-GdkPixbufLoader *gdkpixbufloader
-</SIGNAL>
-
-<SIGNAL>
-<NAME>GdkPixbufLoader::frame-done</NAME>
-<RETURNS>void</RETURNS>
-GdkPixbufLoader *gdkpixbufloader
-GdkPixbufFrame  arg1
-</SIGNAL>
-
diff --git a/docs/reference/gdk/.cvsignore b/docs/reference/gdk/.cvsignore
index c246ccc372..b029291bda 100644
--- a/docs/reference/gdk/.cvsignore
+++ b/docs/reference/gdk/.cvsignore
@@ -2,6 +2,12 @@ Makefile
 Makefile.in
 sgml
 html
+gdk.args
+gdk.signals
+gdk.hierarchy
 gdk-decl.txt
 gdk-decl-list.txt
 gdk-unused.txt
+*.stamp
+*.lo
+.libs
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index e3dfbba41c..dcc8897245 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -6,8 +6,8 @@ DOC_MODULE=gdk
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml
 
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(top_srcdir)/gdk
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gdk
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"
@@ -34,9 +34,9 @@ IGNORE_HFILES=			\
 	win32 			\
 	x11
 
-# Extra files to add when scanning
+# Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
-	$(top_srcdir)/gdk/x11/gdkx.h 
+	../../../gdk/x11/gdkx.h 
 
 # Images to copy into HTML directory
 HTML_IMAGES =
@@ -87,14 +87,14 @@ all-local: html-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
-	cd $(srcdir) && ( \
-	if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
+	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
-	fi )
+	fi
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	touch scan-build.stamp
@@ -114,7 +114,7 @@ tmpl.stamp: tmpl-build.stamp
 
 #### sgml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) 
 	@echo '*** Building SGML ***'
 	cd $(srcdir) && \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
@@ -174,12 +174,12 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
 	-cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
 
-#	for i in $(HTML_IMAGES) ; do          \
-#	  cp $(srcdir)/$$i $(distdir)/html ;  \
-#	done
+	images=$(HTML_IMAGES) ;    	      \
+	for i in $$images ; do		      \
+	  cp $(srcdir)/$$i $(distdir)/html ;  \
+	done
 
 .PHONY : dist-hook-local
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.args b/docs/reference/gdk/gdk.types
index e69de29bb2..e69de29bb2 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.args
+++ b/docs/reference/gdk/gdk.types
diff --git a/docs/reference/gtk/.cvsignore b/docs/reference/gtk/.cvsignore
index 71e304ce25..6f54a49dad 100644
--- a/docs/reference/gtk/.cvsignore
+++ b/docs/reference/gtk/.cvsignore
@@ -4,8 +4,12 @@ sgml
 html
 .libs
 gtk.args
+gtk.hierarchy
 gtk.signals
 gtk-decl.txt
 gtk-decl-list.txt
 gtk-unused.txt
-gtk-scan.lo
\ No newline at end of file
+gtk-scan.lo
+*.stamp
+*.lo
+.libs
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index b001bf2c70..48f17fd321 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -66,6 +66,7 @@ extra_files =
 GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
 	@CFLAGS@					\
 	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
 	-I$(top_builddir)/gdk				\
 	-DGTK_DISABLE_COMPAT_H				\
 	@GTK_DEBUG_FLAGS@				\
@@ -123,14 +124,14 @@ all-local: html-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
-	cd $(srcdir) && ( \
-	if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
+	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
-	fi )
+	fi
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	touch scan-build.stamp
@@ -150,7 +151,7 @@ tmpl.stamp: tmpl-build.stamp
 
 #### sgml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
 	@echo '*** Building SGML ***'
 	cd $(srcdir) && \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
@@ -210,12 +211,12 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
 	-cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
 
-#	for i in $(HTML_IMAGES) ; do          \
-#	  cp $(srcdir)/$$i $(distdir)/html ;  \
-#	done
+	images=$(HTML_IMAGES) ;    	      \
+	for i in $$images ; do		      \
+	  cp $(srcdir)/$$i $(distdir)/html ;  \
+	done
 
 .PHONY : dist-hook-local
diff --git a/docs/reference/gtk/gtk.hierarchy b/docs/reference/gtk/gtk.hierarchy
deleted file mode 100644
index 4655ff729f..0000000000
--- a/docs/reference/gtk/gtk.hierarchy
+++ /dev/null
@@ -1,113 +0,0 @@
-GObject
-  GdkDrawable
-    GdkWindow
-    GdkDrawableImplX11
-      GdkWindowImplX11
-    GdkPixmap
-  GdkColormap
-  GtkSettings
-  GtkObject
-    GtkWidget
-      GtkMisc
-        GtkLabel
-          GtkAccelLabel
-          GtkTipsQuery
-        GtkArrow
-        GtkImage
-        GtkPixmap
-      GtkContainer
-        GtkBin
-          GtkAlignment
-          GtkFrame
-            GtkAspectFrame
-          GtkButton
-            GtkToggleButton
-              GtkCheckButton
-                GtkRadioButton
-            GtkOptionMenu
-          GtkItem
-            GtkMenuItem
-              GtkCheckMenuItem
-                GtkRadioMenuItem
-              GtkTearoffMenuItem
-            GtkListItem
-            GtkTreeItem
-          GtkWindow
-            GtkDialog
-              GtkColorSelectionDialog
-              GtkFileSelection
-              GtkFontSelectionDialog
-              GtkInputDialog
-              GtkMessageDialog
-            GtkPlug
-          GtkEventBox
-          GtkHandleBox
-          GtkScrolledWindow
-          GtkViewport
-        GtkBox
-          GtkButtonBox
-            GtkHButtonBox
-            GtkVButtonBox
-          GtkVBox
-            GtkColorSelection
-            GtkFontSelection
-            GtkGammaCurve
-          GtkHBox
-            GtkCombo
-            GtkStatusbar
-        GtkCList
-          GtkCTree
-        GtkFixed
-        GtkPaned
-          GtkHPaned
-          GtkVPaned
-        GtkLayout
-        GtkList
-        GtkMenuShell
-          GtkMenu
-          GtkMenuBar
-        GtkNotebook
-        GtkPacker
-        GtkSocket
-        GtkTable
-        GtkTextView
-        GtkToolbar
-        GtkTree
-      GtkCalendar
-      GtkDrawingArea
-        GtkCurve
-      GtkEntry
-        GtkSpinButton
-      GtkRuler
-        GtkHRuler
-        GtkVRuler
-      GtkRange
-        GtkScale
-          GtkHScale
-          GtkVScale
-        GtkScrollbar
-          GtkHScrollbar
-          GtkVScrollbar
-      GtkSeparator
-        GtkHSeparator
-        GtkVSeparator
-      GtkInvisible
-      GtkOldEditable
-        GtkText
-      GtkPreview
-      GtkProgress
-        GtkProgressBar
-    GtkAdjustment
-    GtkIMContext
-      GtkIMMulticontext
-    GtkItemFactory
-    GtkTooltips
-  GtkTextBuffer
-  GtkTextTag
-  GtkTextTagTable
-  GtkStyle
-  GdkDragContext
-  GdkImage
-  GdkPixbuf
-  GtkTextChildAnchor
-  GtkTextMark