luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-30 11:06:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Owen Taylor 2001-03-07 20:11:09 +00:00 committed by Owen Taylor
parent f7096ddfd9
commit 4463418e64
7 changed files with 208 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/reference/ChangeLog
View File

@ -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> 2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/tmpl/threads.sgml: Fixed stupid typo. * glib/tmpl/threads.sgml: Fixed stupid typo.

41
docs/reference/glib/Makefile.am
View File

@ -73,20 +73,23 @@ EXTRA_DIST = \
$(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt $(DOC_MODULE)-overrides.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp 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
if ENABLE_GTK_DOC
all-local: html-build.stamp
SCANOBJ_FILES = \ SCANOBJ_FILES = \
$(DOC_MODULE).args \ $(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \ $(DOC_MODULE).hierarchy \
$(DOC_MODULE).signal $(DOC_MODULE).signal
if ENABLE_GTK_DOC
all-local: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB) scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***' @echo '*** Scanning header files ***'
cd $(srcdir) && ( \ 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) ; \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
else \ else \
for i in $(SCANOBJ_FILES) ; do \ 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) gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp touch scan-build.stamp
check_scan: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
$(MAKE) 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 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***' @echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp touch tmpl-build.stamp
check_templates: tmpl.stamp: tmpl-build.stamp
$(MAKE) 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 ***' @echo '*** Building SGML ***'
cd $(srcdir) && \ cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS) gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp touch sgml-build.stamp
check_sgml: sgml.stamp: sgml-build.stamp
$(MAKE) 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 ***' @echo '*** Building HTML ***'
test -d $(srcdir)/html || mkdir $(srcdir)/html test -d $(srcdir)/html || mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) 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 touch html-build.stamp
endif endif
##############
clean-local: 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 maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt 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 ; \ cp $(srcdir)/$$i $(distdir)/html ; \
done done
.PHONY : check_sgml check_templates check_scan dist-hook-local .PHONY : dist-hook-local

1
docs/reference/glib/tmpl/macros_misc.sgml
View File

@ -66,7 +66,6 @@ only one statement is expected by the compiler.
Portable way to copy <type>va_list</type> variables. Portable way to copy <type>va_list</type> variables.
</para> </para>
<!-- # Unused Parameters # -->
@ap1: the <type>va_list</type> variable to place a copy of @ap2 in. @ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
@ap2: a <type>va_list</type>. @ap2: a <type>va_list</type>.

96
docs/reference/gobject/Makefile.am
View File

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

2
docs/reference/gobject/gobject-sections.txt
View File

@ -263,7 +263,7 @@ GTypeValueTable
<SECTION> <SECTION>
<TITLE>Value arrays</TITLE> <TITLE>Value arrays</TITLE>
<FILE>value_types</FILE> <FILE>value_arrays</FILE>
GValueArray GValueArray
g_value_array_new g_value_array_new
g_value_array_copy g_value_array_copy

112
docs/reference/gobject/tmpl/value_arrays.sgml Normal file
View File

@ -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:

2
docs/reference/gobject/tmpl/value_types.sgml
View File

@ -9,13 +9,11 @@ Standard value types
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_VALUE_HOLDS_CHAR ##### --> <!-- ##### MACRO G_VALUE_HOLDS_CHAR ##### -->
<para> <para>