From 628bde5dfe6ba9146ca3cebb67b93b6ad0829bdb Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 19 Feb 2001 06:50:21 +0000 Subject: [PATCH] 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 * 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. --- ChangeLog | 8 + ChangeLog.pre-2-0 | 8 + ChangeLog.pre-2-10 | 8 + ChangeLog.pre-2-12 | 8 + ChangeLog.pre-2-2 | 8 + ChangeLog.pre-2-4 | 8 + ChangeLog.pre-2-6 | 8 + ChangeLog.pre-2-8 | 8 + Makefile.am | 4 + configure.in | 1 + .../gobject/tmpl/gobject-unused.sgml | 238 ------------------ .../gobject/tmpl/value_collection.sgml | 2 + glib-config-2.0.in | 6 +- glib/Makefile.am | 4 + 14 files changed, 80 insertions(+), 239 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57798514a..9f074075b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 57798514a..9f074075b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Feb 19 07:32:38 2001 Tim Janik + + * 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 * gthread.c: include string.h diff --git a/Makefile.am b/Makefile.am index 6976062fc..b6eff7731 100644 --- 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 b212fd1b1..498c4a82b 100644 --- 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 596d11009..8098c0650 100644 --- a/docs/reference/gobject/tmpl/gobject-unused.sgml +++ b/docs/reference/gobject/tmpl/gobject-unused.sgml @@ -18,66 +18,6 @@ Closures - - - - - - - - - - - - - - - - - -Enumeration and Flag Types - - - - - - - - - - - - - - - - - - - -gboxed - - - - - - - - - - - - - - - - - - - -Generic values - - @@ -98,124 +38,6 @@ Generic values gtypemodule.sgml - - -#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. - - -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. - - -#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. - - - - - - - - -#GTypePlugin -The abstract type loader interface. - - - -#GModule -Portable mechanism for dynamically loaded modules. - - - - - - - -Type Loading Modules - - - -GTypeModule - - - - - - - - - - - - - - - - - - - -GTypePlugin - - - - - - - - - - - - - - - - - - - -The Base Object Type - - - - - - - - - - - - - - - - - - - -Parameter Specifications - - The basic concept of the signal system is that of the emission @@ -293,66 +115,6 @@ as general purpose notification mechanism. Signals - - - - - - - - - - - - - - - - - -Standard Parameter Types - - - - - - - - - - - - - - - - - - - -Varargs Value Collection - - - - - - - - - - - - - - - - - - - -Standard value types - - diff --git a/docs/reference/gobject/tmpl/value_collection.sgml b/docs/reference/gobject/tmpl/value_collection.sgml index dfb502d22..7fa82db63 100644 --- 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 df51a28ff..99485193d 100644 --- a/glib-config-2.0.in +++ b/glib-config-2.0.in @@ -7,13 +7,14 @@ exec_prefix_set=no usage() { cat <&2 + ;; *) usage 1 1>&2 ;; diff --git a/glib/Makefile.am b/glib/Makefile.am index 6976062fc..b6eff7731 100644 --- 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: