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

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