my name is glib-config-2.0! don't exit with errorcode!=0 for --help or -h.

Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>

        * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
        don't exit with errorcode!=0 for --help or -h.

        * Makefile.am:
        * configure.in: build glib-config-2.0.

diff --git a/ChangeLog b/ChangeLog
index 5779851..9f07407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5779851..9f07407 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Feb 19 07:32:38 2001  Tim Janik  <timj@gtk.org>
+
+       * glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
+       don't exit with errorcode!=0 for --help or -h.
+       
+       * Makefile.am:
+       * configure.in: build glib-config-2.0.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gthread.c: include string.h

diff --git a/Makefile.am b/Makefile.am
index 6976062..b6eff77 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,6 +191,10 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+bin_SCRIPTS=glib-config-2.0
+BUILT_SOURCES=glib-config-2.0
+glib-config-2.0: glib-config-2.0.in
+
 .PHONY: files release sanity snapshot
 
 files:

diff --git a/configure.in b/configure.in
index b212fd1..498c4a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1826,6 +1826,7 @@ esac
 
 AC_OUTPUT([
 glib-2.0.pc
+glib-config-2.0
 gmodule-2.0.pc
 gthread-2.0.pc
 gobject-2.0.pc

diff --git a/docs/reference/gobject/tmpl/gobject-unused.sgml b/docs/reference/gobject/tmpl/gobject-unused.sgml
index 596d110..8098c06 100644 (file)
--- a/docs/reference/gobject/tmpl/gobject-unused.sgml
+++ b/docs/reference/gobject/tmpl/gobject-unused.sgml
@@ -18,66 +18,6 @@
 Closures
 
 
-<!-- ##### SECTION ./tmpl/enumerations_flags.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/enumerations_flags.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/enumerations_flags.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/enumerations_flags.sgml:Title ##### -->
-Enumeration and Flag Types
-
-
-<!-- ##### SECTION ./tmpl/gboxed.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gboxed.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gboxed.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/gboxed.sgml:Title ##### -->
-gboxed
-
-
-<!-- ##### SECTION ./tmpl/generic_values.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/generic_values.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/generic_values.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/generic_values.sgml:Title ##### -->
-Generic values
-
-
 <!-- ##### SECTION ./tmpl/gtypemodule.sgml.sgml:Long_Description ##### -->
 <para>
 
@@ -98,124 +38,6 @@ Generic values
 gtypemodule.sgml
 
 
-<!-- ##### SECTION ./tmpl/gtypemodule.sgml:Long_Description ##### -->
-<para>
-#GTypeModule provides a simple implementation of the #GTypePlugin
-interface. The model of #GTypeModule is a dynamically loaded module
-which implements some number of types and interface
-implementations. When the module is loaded, it registerse its types
-and interfaces using g_type_module_register_type() and
-g_type_module_add_interface().  As long as any instances of these
-types and interface implementations are in use, the module is kept
-loaded. When the types and interfaces are gone, the module may be
-unloaded. If the types and interfaces become used again, the module
-will be reloaded.
-</para>
-<para>
-Keeping track of whether the module should be loaded or not is done by
-using a use count - it starts at zero, and whenever it is greater than
-zero, the module is loaded. The use count is maintained internally by
-the type system, but also can be explicitely controlled by
-g_type_module_use() and g_type_module_unuse(). Typically, when loading
-a module for the first type, g_type_module_use() will be used to load
-it so that it can initialize its types. At some later point, when the
-module no longer needs to be loaded except for the type
-implementations it contains, g_type_module_unuse() is called.
-</para>
-<para>
-#GTypeModule does not actually provide any implementation of module
-loading and unloading. To create a particular module type you must
-derive from #GTypeModule and implement the load and unload functions
-in #GTypeModuleClass.
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gtypemodule.sgml:See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GTypePlugin</term>
-<listitem><para>The abstract type loader interface.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GModule</term>
-<listitem><para>Portable mechanism for dynamically loaded modules.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gtypemodule.sgml:Short_Description ##### -->
-Type Loading Modules
-
-
-<!-- ##### SECTION ./tmpl/gtypemodule.sgml:Title ##### -->
-GTypeModule
-
-
-<!-- ##### SECTION ./tmpl/gtypeplugin.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gtypeplugin.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gtypeplugin.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/gtypeplugin.sgml:Title ##### -->
-GTypePlugin
-
-
-<!-- ##### SECTION ./tmpl/objects.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/objects.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/objects.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/objects.sgml:Title ##### -->
-The Base Object Type
-
-
-<!-- ##### SECTION ./tmpl/param_specs.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/param_specs.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/param_specs.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/param_specs.sgml:Title ##### -->
-Parameter Specifications
-
-
 <!-- ##### SECTION ./tmpl/signals.sgml:Long_Description ##### -->
 <para>
 The basic concept of the signal system is that of the <emphasis>emission</emphasis>
@@ -293,66 +115,6 @@ as general purpose notification mechanism.
 Signals
 
 
-<!-- ##### SECTION ./tmpl/standard_params.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/standard_params.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/standard_params.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/standard_params.sgml:Title ##### -->
-Standard Parameter Types
-
-
-<!-- ##### SECTION ./tmpl/value_collection.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/value_collection.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/value_collection.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/value_collection.sgml:Title ##### -->
-Varargs Value Collection
-
-
-<!-- ##### SECTION ./tmpl/value_types.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/value_types.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/value_types.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/value_types.sgml:Title ##### -->
-Standard value types
-
-
 <!-- ##### USER_FUNCTION GObjectGetParamFunc ##### -->
 <para>
 

diff --git a/docs/reference/gobject/tmpl/value_collection.sgml b/docs/reference/gobject/tmpl/value_collection.sgml
index dfb502d..7fa82db 100644 (file)
--- a/docs/reference/gobject/tmpl/value_collection.sgml
+++ b/docs/reference/gobject/tmpl/value_collection.sgml
@@ -27,6 +27,7 @@ Varargs Value Collection
 
 @value: 
 @var_args: 
+@flags: 
 @__error: 
 
 
@@ -37,6 +38,7 @@ Varargs Value Collection
 
 @value: 
 @var_args: 
+@flags: 
 @__error: 
 
 

diff --git a/glib-config-2.0.in b/glib-config-2.0.in
index df51a28..9948519 100644 (file)
--- a/glib-config-2.0.in
+++ b/glib-config-2.0.in
@@ -7,13 +7,14 @@ exec_prefix_set=no
 usage()
 {
        cat <<EOF
-Usage: glib-config [OPTIONS] [LIBRARIES]
+Usage: glib-config-2.0 [OPTIONS] [LIBRARIES]
 Options:
        [--prefix[=DIR]]
        [--exec-prefix[=DIR]]
        [--version]
        [--libs]
        [--cflags]
+       [--help]
 Libraries:
        glib
        gmodule
@@ -75,6 +76,9 @@ while test $# -gt 0; do
     gthread)
       lib_gthread=yes
       ;;
+    --help | -h)
+      usage 0 1>&2
+      ;;
     *)
       usage 1 1>&2
       ;;

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 6976062..b6eff77 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -191,6 +191,10 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+bin_SCRIPTS=glib-config-2.0
+BUILT_SOURCES=glib-config-2.0
+glib-config-2.0: glib-config-2.0.in
+
 .PHONY: files release sanity snapshot
 
 files: