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

Improve separation of generic non-generic parts and dependencies.

Browse Source 
Wed Sep  6 10:59:45 2000  Owen Taylor  <otaylor@redhat.com>

	* gobject/Makefile.am glib/Makefile.am: Improve
	separation of generic non-generic parts and dependencies.
This commit is contained in:
Owen Taylor 2000-09-06 15:01:07 +00:00 committed by Owen Taylor
parent da765af2bc
commit 98dbc6a710
65 changed files with 135 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -1606,6 +1606,8 @@ gthread/Makefile
docs/Makefile docs/Makefile
docs/glib-config.1 docs/glib-config.1
docs/reference/Makefile docs/reference/Makefile
docs/reference/glib/Makefile
docs/reference/gobject/Makefile
tests/Makefile tests/Makefile
],[case "$CONFIG_FILES" in ],[case "$CONFIG_FILES" in
*glib-config-2.0*)chmod +x glib-config-2.0;; *glib-config-2.0*)chmod +x glib-config-2.0;;

5
docs/reference/ChangeLog
View File

@ -1,3 +1,8 @@
Wed Sep 6 10:59:45 2000 Owen Taylor <otaylor@redhat.com>
* gobject/Makefile.am glib/Makefile.am: Improve
separation of generic non-generic parts and dependencies.
Tue Sep 5 20:03:25 2000 Owen Taylor <otaylor@redhat.com> Tue Sep 5 20:03:25 2000 Owen Taylor <otaylor@redhat.com>
* Moved into glib source tree, updated glib-sections.txt * Moved into glib source tree, updated glib-sections.txt

1
docs/reference/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = glib gobject

2
docs/reference/glib/.cvsignore
View File

@ -1,3 +1,5 @@
Makefile
Makefile.in
glib-unused.txt glib-unused.txt
glib-decl-list.txt glib-decl-list.txt
glib-decl.txt glib-decl.txt

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

@ -6,10 +6,17 @@ DOC_MODULE=glib
# The top-level SGML file. # The top-level SGML file.
DOC_MAIN_SGML_FILE=glib-docs.sgml DOC_MAIN_SGML_FILE=glib-docs.sgml
# The directory containing the source code (if it contains documentation). # The directory containing the source code
DOC_SOURCE_DIR=$(top_srcdir) DOC_SOURCE_DIR=$(top_srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) # Headers to ignore
IGNORE_HFILES= \
gobject \
config.h \
gmoduleconf.h \
gunidecomp.h \
gunichartables.h \
glibconfig-sysdefs.h
tmpl_sources = \ tmpl_sources = \
tmpl/allocators.sgml \ tmpl/allocators.sgml \
@ -60,33 +67,37 @@ tmpl_sources = \
tmpl/warnings.sgml \ tmpl/warnings.sgml \
tmpl/windows.sgml tmpl/windows.sgml
glib_docdir = $(HTML_DIR)
glib_doc_DATA = \ ####################################
glib-sections.txt \ # Everything below here is generic #
glib-overrides.txt ####################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \ EXTRA_DIST = \
$(glib_doc_DATA) $(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
if ENABLE_GTK_DOC if ENABLE_GTK_DOC
all-local: html/index.html all-local: html/index.html
glib-decl.txt: $(DOC_MODULE)-decl.txt:
$(MAKE) scan $(MAKE) scan
$(tmpl_sources): glib-decl.txt glib-sections.txt glib-overrides.txt $(tmpl_sources): $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
$(MAKE) templates $(MAKE) templates
sgml/glib-doc.bottom: $(tmpl_sources) glib-decl.txt sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
$(MAKE) sgml $(MAKE) sgml
html/index.html: sgml/glib-doc.bottom html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE)
$(MAKE) html $(MAKE) html
endif endif
scan: scan:
-(cd $(srcdir) \ -(cd $(srcdir) \
&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="gobject config.h gmoduleconf.h gunidecomp.h gunichartables.h glibconfig-sysdefs.h" ) && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" )
templates: templates:
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
@ -121,7 +132,18 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi) fi)
dist-hook: #
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist
@false
endif
dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html mkdir $(distdir)/html
mkdir $(distdir)/sgml mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl mkdir $(distdir)/tmpl

8
docs/reference/glib/glib-sections.txt
View File

@ -272,12 +272,6 @@ G_GNUC_PRETTY_FUNCTION
G_STRLOC G_STRLOC
<SUBSECTION> <SUBSECTION>
G_GSHORT_FORMAT
G_GUSHORT_FORMAT
G_GINT_FORMAT
G_GUINT_FORMAT
G_GLONG_FORMAT
G_GULONG_FORMAT
G_GINT16_FORMAT G_GINT16_FORMAT
G_GUINT16_FORMAT G_GUINT16_FORMAT
G_GINT32_FORMAT G_GINT32_FORMAT
@ -711,7 +705,7 @@ g_strsignal
<SECTION> <SECTION>
<TITLE>Date and Time Functions</TITLE> <TITLE>Date and Time Functions</TITLE>
<FILE>date</FILE> <FILE>date</FILE>
G_MICROSEC G_USEC_PER_SEC
GTimeVal GTimeVal
g_get_current_time g_get_current_time
g_usleep g_usleep

2
docs/reference/glib/tmpl/allocators.sgml
View File

@ -9,13 +9,11 @@ Memory Allocators
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GAllocator ##### --> <!-- ##### STRUCT GAllocator ##### -->
<para> <para>

2
docs/reference/glib/tmpl/arrays.sgml
View File

@ -9,13 +9,11 @@ Arrays
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GArray ##### --> <!-- ##### STRUCT GArray ##### -->
<para> <para>

2
docs/reference/glib/tmpl/arrays_byte.sgml
View File

@ -9,13 +9,11 @@ Byte Arrays
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GByteArray ##### --> <!-- ##### STRUCT GByteArray ##### -->
<para> <para>

2
docs/reference/glib/tmpl/arrays_pointer.sgml
View File

@ -9,13 +9,11 @@ Pointer Arrays
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GPtrArray ##### --> <!-- ##### STRUCT GPtrArray ##### -->
<para> <para>

2
docs/reference/glib/tmpl/async_queues.sgml
View File

@ -9,13 +9,11 @@ Asynchronous Queues
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GAsyncQueue ##### --> <!-- ##### STRUCT GAsyncQueue ##### -->
<para> <para>

2
docs/reference/glib/tmpl/byte_order.sgml
View File

@ -9,13 +9,11 @@ Byte Order Macros
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_BYTE_ORDER ##### --> <!-- ##### MACRO G_BYTE_ORDER ##### -->
<para> <para>

2
docs/reference/glib/tmpl/caches.sgml
View File

@ -9,13 +9,11 @@ Caches
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GCache ##### --> <!-- ##### STRUCT GCache ##### -->
<para> <para>

2
docs/reference/glib/tmpl/completion.sgml
View File

@ -9,13 +9,11 @@ Automatic String Completion
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GCompletion ##### --> <!-- ##### STRUCT GCompletion ##### -->
<para> <para>

2
docs/reference/glib/tmpl/datalist.sgml
View File

@ -9,13 +9,11 @@ Keyed Data Lists
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GData ##### --> <!-- ##### STRUCT GData ##### -->
<para> <para>

2
docs/reference/glib/tmpl/datasets.sgml
View File

@ -9,13 +9,11 @@ Datasets
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO g_dataset_id_set_data ##### --> <!-- ##### MACRO g_dataset_id_set_data ##### -->
<para> <para>

4
docs/reference/glib/tmpl/date.sgml
View File

@ -9,14 +9,12 @@ Date and Time Functions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_USEC_PER_SEC ##### -->
<!-- ##### MACRO G_MICROSEC ##### -->
<para> <para>
</para> </para>

2
docs/reference/glib/tmpl/error_reporting.sgml
View File

@ -9,13 +9,11 @@ Error Reporting
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GError ##### --> <!-- ##### STRUCT GError ##### -->
<para> <para>

42
docs/reference/glib/tmpl/glib-unused.sgml
View File

@ -0,0 +1,42 @@
<!-- ##### MACRO G_GLONG_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GSHORT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GUSHORT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GINT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GUINT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GULONG_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_MICROSEC ##### -->
<para>
</para>

2
docs/reference/glib/tmpl/hash_tables.sgml
View File

@ -9,13 +9,11 @@ Hash Tables
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GHashTable ##### --> <!-- ##### STRUCT GHashTable ##### -->
<para> <para>

2
docs/reference/glib/tmpl/hooks.sgml
View File

@ -9,13 +9,11 @@ Hook Functions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GHookList ##### --> <!-- ##### STRUCT GHookList ##### -->
<para> <para>

2
docs/reference/glib/tmpl/iochannels.sgml
View File

@ -9,13 +9,11 @@ IO Channels
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GIOChannel ##### --> <!-- ##### STRUCT GIOChannel ##### -->
<para> <para>

2
docs/reference/glib/tmpl/limits.sgml
View File

@ -9,13 +9,11 @@ Limits of Basic Types
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_MININT ##### --> <!-- ##### MACRO G_MININT ##### -->
<para> <para>

2
docs/reference/glib/tmpl/linked_lists_double.sgml
View File

@ -9,13 +9,11 @@ Doubly-Linked Lists
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GList ##### --> <!-- ##### STRUCT GList ##### -->
<para> <para>

2
docs/reference/glib/tmpl/linked_lists_single.sgml
View File

@ -9,13 +9,11 @@ Singly-Linked Lists
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GSList ##### --> <!-- ##### STRUCT GSList ##### -->
<para> <para>

2
docs/reference/glib/tmpl/macros.sgml
View File

@ -9,13 +9,11 @@ Standard Macros
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO GLIB_MAJOR_VERSION ##### --> <!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ Miscellaneous Macros
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_INLINE_FUNC ##### --> <!-- ##### MACRO G_INLINE_FUNC ##### -->
<para> <para>
@ -137,48 +135,6 @@ Miscellaneous Macros
<!-- ##### MACRO G_GSHORT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GUSHORT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GINT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GUINT_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GLONG_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GULONG_FORMAT ##### -->
<para>
</para>
<!-- ##### MACRO G_GINT16_FORMAT ##### --> <!-- ##### MACRO G_GINT16_FORMAT ##### -->
<para> <para>

2
docs/reference/glib/tmpl/main.sgml
View File

@ -9,13 +9,11 @@ The Main Event Loop
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GMainLoop ##### --> <!-- ##### STRUCT GMainLoop ##### -->
<para> <para>

2
docs/reference/glib/tmpl/memory.sgml
View File

@ -9,13 +9,11 @@ Memory Allocation
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO g_new ##### --> <!-- ##### MACRO g_new ##### -->
<para> <para>

2
docs/reference/glib/tmpl/memory_chunks.sgml
View File

@ -9,13 +9,11 @@ Memory Chunks
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GMemChunk ##### --> <!-- ##### STRUCT GMemChunk ##### -->
<para> <para>

2
docs/reference/glib/tmpl/messages.sgml
View File

@ -9,13 +9,11 @@ Message Logging
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_LOG_DOMAIN ##### --> <!-- ##### MACRO G_LOG_DOMAIN ##### -->
<para> <para>

2
docs/reference/glib/tmpl/misc_utils.sgml
View File

@ -9,13 +9,11 @@ Miscellaneous Utility Functions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### FUNCTION g_get_prgname ##### --> <!-- ##### FUNCTION g_get_prgname ##### -->
<para> <para>

2
docs/reference/glib/tmpl/modules.sgml
View File

@ -9,13 +9,11 @@ Dynamic Loading of Modules
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GModule ##### --> <!-- ##### STRUCT GModule ##### -->
<para> <para>

2
docs/reference/glib/tmpl/numerical.sgml
View File

@ -9,13 +9,11 @@ Numerical Definitions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_IEEE754_FLOAT_BIAS ##### --> <!-- ##### MACRO G_IEEE754_FLOAT_BIAS ##### -->
<para> <para>

2
docs/reference/glib/tmpl/quarks.sgml
View File

@ -9,13 +9,11 @@ Quarks
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### TYPEDEF GQuark ##### --> <!-- ##### TYPEDEF GQuark ##### -->
<para> <para>

2
docs/reference/glib/tmpl/queue.sgml
View File

@ -9,13 +9,11 @@ Double-ended Queues
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GQueue ##### --> <!-- ##### STRUCT GQueue ##### -->
<para> <para>

2
docs/reference/glib/tmpl/random_numbers.sgml
View File

@ -9,13 +9,11 @@ Random Numbers
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GRand ##### --> <!-- ##### STRUCT GRand ##### -->
<para> <para>

2
docs/reference/glib/tmpl/relations.sgml
View File

@ -9,13 +9,11 @@ Relations and Tuples
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GRelation ##### --> <!-- ##### STRUCT GRelation ##### -->
<para> <para>

2
docs/reference/glib/tmpl/scanner.sgml
View File

@ -9,13 +9,11 @@ Lexical Scanner
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GScanner ##### --> <!-- ##### STRUCT GScanner ##### -->
<para> <para>

2
docs/reference/glib/tmpl/string_chunks.sgml
View File

@ -9,13 +9,11 @@ String Chunks
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GStringChunk ##### --> <!-- ##### STRUCT GStringChunk ##### -->
<para> <para>

2
docs/reference/glib/tmpl/string_utils.sgml
View File

@ -9,13 +9,11 @@ String Utility Functions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### FUNCTION g_strdup ##### --> <!-- ##### FUNCTION g_strdup ##### -->
<para> <para>

2
docs/reference/glib/tmpl/strings.sgml
View File

@ -9,13 +9,11 @@ Strings
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GString ##### --> <!-- ##### STRUCT GString ##### -->
<para> <para>

2
docs/reference/glib/tmpl/thread_pools.sgml
View File

@ -9,13 +9,11 @@ Thread Pools
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GThreadPool ##### --> <!-- ##### STRUCT GThreadPool ##### -->
<para> <para>

2
docs/reference/glib/tmpl/threads.sgml
View File

@ -9,13 +9,11 @@ Threads
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_THREADS_ENABLED ##### --> <!-- ##### MACRO G_THREADS_ENABLED ##### -->
<para> <para>

2
docs/reference/glib/tmpl/timers.sgml
View File

@ -9,13 +9,11 @@ Timers
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GTimer ##### --> <!-- ##### STRUCT GTimer ##### -->
<para> <para>

2
docs/reference/glib/tmpl/trash_stack.sgml
View File

@ -9,13 +9,11 @@ Trash Stacks
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GTrashStack ##### --> <!-- ##### STRUCT GTrashStack ##### -->
<para> <para>

2
docs/reference/glib/tmpl/trees-binary.sgml
View File

@ -9,13 +9,11 @@ Balanced Binary Trees
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GTree ##### --> <!-- ##### STRUCT GTree ##### -->
<para> <para>

2
docs/reference/glib/tmpl/trees-nary.sgml
View File

@ -9,13 +9,11 @@ N-ary Trees
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GNode ##### --> <!-- ##### STRUCT GNode ##### -->
<para> <para>

2
docs/reference/glib/tmpl/type_conversion.sgml
View File

@ -9,13 +9,11 @@ Type Conversion Macros
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO GINT_TO_POINTER ##### --> <!-- ##### MACRO GINT_TO_POINTER ##### -->
<para> <para>

2
docs/reference/glib/tmpl/types.sgml
View File

@ -9,13 +9,11 @@ Basic Types
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### TYPEDEF gboolean ##### --> <!-- ##### TYPEDEF gboolean ##### -->
<para> <para>

8
docs/reference/glib/tmpl/unicode.sgml
View File

@ -9,13 +9,11 @@ Unicode Manipulation
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### TYPEDEF gunichar ##### --> <!-- ##### TYPEDEF gunichar ##### -->
<para> <para>
@ -326,6 +324,8 @@ Unicode Manipulation
@p: @p:
@end: @end:
@Returns: @Returns:
<!-- # Unused Parameters # -->
@bound:
<!-- ##### FUNCTION g_utf8_find_prev_char ##### --> <!-- ##### FUNCTION g_utf8_find_prev_char ##### -->
@ -367,6 +367,8 @@ Unicode Manipulation
@p: @p:
@c: @c:
@Returns: @Returns:
<!-- # Unused Parameters # -->
@ch:
<!-- ##### FUNCTION g_utf8_strrchr ##### --> <!-- ##### FUNCTION g_utf8_strrchr ##### -->
@ -377,6 +379,8 @@ Unicode Manipulation
@p: @p:
@c: @c:
@Returns: @Returns:
<!-- # Unused Parameters # -->
@ch:
<!-- ##### FUNCTION g_utf8_to_utf16 ##### --> <!-- ##### FUNCTION g_utf8_to_utf16 ##### -->

2
docs/reference/glib/tmpl/warnings.sgml
View File

@ -9,13 +9,11 @@ Warnings and Assertions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### FUNCTION g_print ##### --> <!-- ##### FUNCTION g_print ##### -->
<para> <para>

2
docs/reference/glib/tmpl/windows.sgml
View File

@ -9,13 +9,11 @@ Windows Compatability Functions
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO MAXPATHLEN ##### --> <!-- ##### MACRO MAXPATHLEN ##### -->
<para> <para>

2
docs/reference/gobject/.cvsignore
View File

@ -1,3 +1,5 @@
Makefile
Makefile.in
gobject-decl.txt gobject-decl.txt
gobject-unused.txt gobject-unused.txt
gobject-decl-list.txt gobject-decl-list.txt

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

@ -9,7 +9,8 @@ DOC_MAIN_SGML_FILE=gobject-docs.sgml
# The directory containing the source code (if it contains documentation). # The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR=$(top_srcdir)/gobject DOC_SOURCE_DIR=$(top_srcdir)/gobject
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) # Headers to ignore
IGNORE_HFILES=
tmpl_sources = \ tmpl_sources = \
tmpl/enumerations_flags.sgml \ tmpl/enumerations_flags.sgml \
@ -22,35 +23,38 @@ tmpl_sources = \
tmpl/value_collection.sgml \ tmpl/value_collection.sgml \
tmpl/value_types.sgml tmpl/value_types.sgml
gobject_docdir = $(HTML_DIR) ####################################
gobject_doc_DATA = \ # Everything below here is generic #
gobject-sections.txt ####################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \ EXTRA_DIST = \
$(gobject_doc_DATA) $(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
if ENABLE_GTK_DOC if ENABLE_GTK_DOC
all-local: html/index.html all-local: html/index.html
gobject-decl.txt: $(DOC_MODULE)-decl.txt:
$(MAKE) scan $(MAKE) scan
$(tmpl_sources): gobject-decl.txt gobject-sections.txt $(tmpl_sources): $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
$(MAKE) templates $(MAKE) templates
sgml/gobject-doc.bottom: $(tmpl_sources) gobject-decl.txt sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
$(MAKE) sgml $(MAKE) sgml
html/index.html: sgml/gobject-doc.bottom html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE)
$(MAKE) html $(MAKE) html
endif endif
scan: scan:
-(cd $(srcdir) \ -(cd $(srcdir) \
&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) ) && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" )
templates: templates:
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
sgml: sgml:
@ -60,8 +64,8 @@ sgml:
html: 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)
@echo '-- Fixing Crossreferences' @echo '-- Fixing Crossreferences'
gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) --extra-dir=$(srcdir)/../glib/html gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR)
clean-local: clean-local:
rm -f *~ *.bak *.signals *-unused.txt rm -f *~ *.bak *.signals *-unused.txt
@ -83,7 +87,18 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi) fi)
dist-hook: #
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist
@false
endif
dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html mkdir $(distdir)/html
mkdir $(distdir)/sgml mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl mkdir $(distdir)/tmpl

17
docs/reference/gobject/gobject-docs.sgml
View File

@ -16,13 +16,14 @@
<reference> <reference>
<title>API Reference</title> <title>API Reference</title>
&gobject-types; &gobject-types;
&gobject-objects; &gobject-objects;
&gobject-enumerations-flags; &gobject-enumerations-flags;
&gobject-generic-values; &gobject-generic-values;
&gobject-value-types; &gobject-value-types;
&gobject-value-collection; &gobject-value-collection;
&gobject-param-specs; &gobject-param-specs;
&gobject-standard-params; &gobject-standard-params;
</reference>
</book> </book>

0
docs/reference/gobject/gobject-overrides.txt Normal file
View File

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

@ -9,13 +9,11 @@ Enumeration and Flag Types
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GEnumClass ##### --> <!-- ##### STRUCT GEnumClass ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ Generic values
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_VALUE_TYPE ##### --> <!-- ##### MACRO G_VALUE_TYPE ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ The Base Object Type
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GObject ##### --> <!-- ##### STRUCT GObject ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ Object Parameter Specifications
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GParamSpec ##### --> <!-- ##### STRUCT GParamSpec ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ Standard Parameter Types
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### MACRO G_IS_PARAM_SPEC_CHAR ##### --> <!-- ##### MACRO G_IS_PARAM_SPEC_CHAR ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ GType
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### TYPEDEF GType ##### --> <!-- ##### TYPEDEF GType ##### -->
<para> <para>

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

@ -9,13 +9,11 @@ Varargs Value Collection
</para> </para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### UNION GTypeCValue ##### --> <!-- ##### UNION GTypeCValue ##### -->
<para> <para>

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_IS_VALUE_CHAR ##### --> <!-- ##### MACRO G_IS_VALUE_CHAR ##### -->
<para> <para>