Improve separation of generic non-generic parts and dependencies.

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

View File

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

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>
* Moved into glib source tree, updated glib-sections.txt

View File

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

View File

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

View File

@ -6,10 +6,17 @@ DOC_MODULE=glib
# The top-level SGML file.
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)
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/allocators.sgml \
@ -60,33 +67,37 @@ tmpl_sources = \
tmpl/warnings.sgml \
tmpl/windows.sgml
glib_docdir = $(HTML_DIR)
glib_doc_DATA = \
glib-sections.txt \
glib-overrides.txt
####################################
# Everything below here is generic #
####################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(glib_doc_DATA)
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
if ENABLE_GTK_DOC
all-local: html/index.html
glib-decl.txt:
$(DOC_MODULE)-decl.txt:
$(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
sgml/glib-doc.bottom: $(tmpl_sources) glib-decl.txt
sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
$(MAKE) sgml
html/index.html: sgml/glib-doc.bottom
html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE)
$(MAKE) html
endif
scan:
-(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:
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
@ -121,7 +132,18 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
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)/sgml
mkdir $(distdir)/tmpl

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -9,13 +9,11 @@ Miscellaneous Macros
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### MACRO G_INLINE_FUNC ##### -->
<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 ##### -->
<para>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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