Revert Tim's last commit to get rid of 7+ unnecessary / broken changes.

Wed Mar  7 15:02:17 2001  Owen Taylor  <otaylor@redhat.com>

	* gobject/Makefile.am: Revert Tim's last commit to
	get rid of 7+ unnecessary / broken changes. Add
	back the useful part. Also fix problem with grep,
	add dependency on template files.

	* gobject/gobject-sections.txt: Remove double
	value_types names which was screwing up builds.

	* glib/Makefile.am: Propagate changes from
	gobject/Makefile.am

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e25f06321e197a8ba56431732388732b11655fbf..bad4c00a9fa9141d8263e6d0f47bcee3c3b82970 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,16 @@
+Wed Mar  7 15:02:17 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gobject/Makefile.am: Revert Tim's last commit to
+       get rid of 7+ unnecessary / broken changes. Add
+       back the useful part. Also fix problem with grep,
+       add dependency on template files.
+
+       * gobject/gobject-sections.txt: Remove double 
+       value_types names which was screwing up builds.
+
+       * glib/Makefile.am: Propagate changes from 
+       gobject/Makefile.am
+
 2001-03-07  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/tmpl/threads.sgml: Fixed stupid typo.

diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index b0ec50a76aa0c48fb0beef725bbae9cc8bcbf939..6aaaf8fb74f4fc7febbbe6f1981619fd1c860582 100644 (file)
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -73,20 +73,23 @@ EXTRA_DIST =                                \
        $(DOC_MODULE)-sections.txt      \
        $(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+          $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
 
 SCANOBJ_FILES =                \
        $(DOC_MODULE).args      \
        $(DOC_MODULE).hierarchy \
        $(DOC_MODULE).signal
 
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
 scan-build.stamp: $(HFILE_GLOB)
        @echo '*** Scanning header files ***'
        cd $(srcdir) && ( \
-       if grep -l '^.+$$' $(DOC_MODULE).types > /dev/null ; then \
+       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) ; \
        else \
            for i in $(SCANOBJ_FILES) ; do \
@@ -97,33 +100,33 @@ scan-build.stamp: $(HFILE_GLOB)
          gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
        touch scan-build.stamp
 
-check_scan:
-       $(MAKE) scan-build.stamp
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+       @true
 
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): check_scan
+#### templates ####
 
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
        @echo '*** Rebuilding template files ***'
        cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
        touch tmpl-build.stamp
 
-check_templates: 
-       $(MAKE) tmpl-build.stamp
+tmpl.stamp: tmpl-build.stamp
+       @true
 
-tmpl.stamp: check_templates
+#### sgml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB)
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
        @echo '*** Building SGML ***'
        cd $(srcdir) && \
        gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
        touch sgml-build.stamp
 
-check_sgml:
-       $(MAKE) sgml-build.stamp
+sgml.stamp: sgml-build.stamp
+       @true
 
-sgml.stamp: check_sgml
+#### html ####
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '*** Building HTML ***'
        test -d $(srcdir)/html || mkdir $(srcdir)/html
        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -133,8 +136,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
        touch html-build.stamp
 endif
 
+##############
+
 clean-local:
-       rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) $(srcdir)/sgml.stamp 
+       rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
 
 maintainer-clean-local: clean
        cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@@ -177,4 +182,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
          cp $(srcdir)/$$i $(distdir)/html ;  \
         done
 
-.PHONY : check_sgml check_templates check_scan dist-hook-local
+.PHONY : dist-hook-local

diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index 994ffb73084ffa3a8f1eff2538277a36cd181022..a7768c73393efb09ae48e1ac2e2ca7ed613baed0 100644 (file)
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -66,7 +66,6 @@ only one statement is expected by the compiler.
 Portable way to copy <type>va_list</type> variables.
 </para>
 
-<!-- # Unused Parameters # -->
 @ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
 @ap2: a <type>va_list</type>.
 

diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index e515bf7fccd7bf76d5a8f43bf4c66e7ae9652cdd..d3405116749868ef72debe4e4f4e07b62b23828e 100644 (file)
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -2,36 +2,47 @@
 
 # The name of the module.
 DOC_MODULE=gobject
+
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gobject-docs.sgml
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-EXTRA_DIST +=
+
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gobject
+
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=
+
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=
+
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html
-# Images to copy into HTML directory
-HTML_IMAGES =
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gobject/*.h
 CFILE_GLOB=$(top_srcdir)/gobject/*.c
+
 # Headers to ignore
 IGNORE_HFILES=                         \
-       .saved                          \
-       glib-genmarshal.c               \
        gbsearcharray.h
+
 # Extra files to add when scanning
 EXTRA_HFILES=
 
+# Images to copy into HTML directory
+HTML_IMAGES =
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
+content_files =
+
+# Other files to distribute
+extra_files =
+
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =
 GTKDOC_LIBS =
+
 # Commands for compiling and linking 
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
@@ -43,29 +54,32 @@ GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-DOC_STAMPS = $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-            build-scan.stamp build-tmpl.stamp build-sgml.stamp build-html.stamp
-# gtkdoc-mktmpl:       creates, and on changes touches:        tmpl.stamp
-# gtkdoc-mkdb:         creates, and on changes touches:        sgml.stamp
-# gtkdoc-mkhtml:       creates, and on changes touches:        html.stamp
-
+EXTRA_DIST =                           \
+       $(content_files)                \
+       $(extra_files)                  \
+       $(HTML_IMAGES)                  \
+       $(DOC_MAIN_SGML_FILE)           \
+       $(DOC_MODULE).types             \
+       $(DOC_MODULE)-sections.txt      \
+       $(DOC_MODULE)-overrides.txt
 
-.PHONY: gtkdoc-build-all
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+          $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
 
-if ENABLE_GTK_DOC
 SCANOBJ_FILES =                \
        $(DOC_MODULE).args      \
        $(DOC_MODULE).hierarchy \
        $(DOC_MODULE).signal
 
-all-local: gtkdoc-build-all
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
 
-gtkdoc-build-all: build-sgml.stamp build-html.stamp
-       @true
-build-scan.stamp: $(HFILE_GLOB)
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
        @echo '*** Scanning header files ***'
        cd $(srcdir) && ( \
-       if grep -l '^.+$$' $(DOC_MODULE).types > /dev/null 2>/dev/null ; then \
+       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) ; \
        else \
            for i in $(SCANOBJ_FILES) ; do \
@@ -74,30 +88,46 @@ build-scan.stamp: $(HFILE_GLOB)
        fi )
        cd $(srcdir) && \
          gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       touch build-scan.stamp
-build-tmpl.stamp: build-scan.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(srcdir)/tmpl/*.sgml
+       touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+       @true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
        @echo '*** Rebuilding template files ***'
        cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-       touch build-tmpl.stamp
-tmpl.stamp: build-tmpl.stamp
+       touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
        @true
-build-sgml.stamp: tmpl.stamp $(CFILE_GLOB)
+
+#### sgml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
        @echo '*** Building SGML ***'
        cd $(srcdir) && \
        gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
-       touch build-sgml.stamp
-sgml.stamp: build-sgml.stamp
+       touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
        @true
-build-html.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '*** Building HTML ***'
        test -d $(srcdir)/html || mkdir $(srcdir)/html
        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
        @echo '-- Fixing Crossreferences' 
        cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       touch build-html.stamp
+       touch html-build.stamp
 endif
 
+##############
+
 clean-local:
        rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
 
@@ -142,12 +172,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
          cp $(srcdir)/$$i $(distdir)/html ;  \
         done
 
-.PHONY: dist-hook-local
-
-
-EXTRA_DIST =                           \
-       $(HTML_IMAGES)                  \
-       $(DOC_MAIN_SGML_FILE)           \
-       $(DOC_MODULE).types             \
-       $(DOC_MODULE)-sections.txt      \
-       $(DOC_MODULE)-overrides.txt
+.PHONY : dist-hook-local

diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt
index 550c4c240ead878968b9ab7f9ecd067679f8e580..9d43e4b0b12a2931d9870f7e9ade221706cbdfb4 100644 (file)
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@ -263,7 +263,7 @@ GTypeValueTable
 
 <SECTION>
 <TITLE>Value arrays</TITLE>
-<FILE>value_types</FILE>
+<FILE>value_arrays</FILE>
 GValueArray
 g_value_array_new
 g_value_array_copy

diff --git a/docs/reference/gobject/tmpl/value_arrays.sgml b/docs/reference/gobject/tmpl/value_arrays.sgml
new file mode 100644 (file)
index 0000000..e9a30c9
--- /dev/null
+++ b/docs/reference/gobject/tmpl/value_arrays.sgml
@@ -0,0 +1,112 @@
+<!-- ##### SECTION Title ##### -->
+Value arrays
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GValueArray ##### -->
+<para>
+
+</para>
+
+@n_values: 
+@values: 
+
+<!-- ##### FUNCTION g_value_array_new ##### -->
+<para>
+
+</para>
+
+@n_prealloced: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_copy ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_free ##### -->
+<para>
+
+</para>
+
+@value_array: 
+
+
+<!-- ##### FUNCTION g_value_array_append ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_prepend ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_insert ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@index: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_remove ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@index: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_sort ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@compare_func: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_value_array_sort_with_data ##### -->
+<para>
+
+</para>
+
+@value_array: 
+@compare_func: 
+@user_data: 
+@Returns: 
+
+

diff --git a/docs/reference/gobject/tmpl/value_types.sgml b/docs/reference/gobject/tmpl/value_types.sgml
index fe77eb6aedf365441ff866f269d33bcc91dcece0..62dc75a526e535db5d20a8bbfd791d1dcf8e518d 100644 (file)
--- a/docs/reference/gobject/tmpl/value_types.sgml
+++ b/docs/reference/gobject/tmpl/value_types.sgml
@@ -9,13 +9,11 @@ Standard value types
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### MACRO G_VALUE_HOLDS_CHAR ##### -->
 <para>