mxe-octave: src/glib-1-fixes.patch annotate

annotate src/glib-1-fixes.patch @ 2635:383ab5d1e69f

package glib: remove need for gtk-doc

author	Mark Brand <mabrand@mabrand.nl>
date	Mon, 18 Jun 2012 16:57:30 +0200
parents	54ebb3d54d97
children	8b3bb715b237

rev	line source
2333 f653602a0500 Rebrand to new project name MXE Volker Grabsch <vog@notjusthosting.com> parents: 1887 diff changeset	1 This file is part of MXE.
2353 99516e73b368 Move doc/index.html -> index.html Volker Grabsch <vog@notjusthosting.com> parents: 2333 diff changeset	2 See index.html for further information.
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	3
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	4 Contains ad hoc patches for cross building.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	5
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	6 From 2a15b5d8c570d34e44d315116219bcd731054a54 Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	7 From: "a@mxe.cc" <a@mxe.cc>
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	8 Date: Thu, 23 Sep 2010 21:41:51 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	9 Subject: [PATCH 1/8] optional gettext
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	10
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	11 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	12 configure.ac \| 4 ++--
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	13 glib/gi18n.h \| 5 +++++
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	14 2 files changed, 7 insertions(+), 2 deletions(-)
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	15
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	16 diff --git a/configure.ac b/configure.ac
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	17 index cadd925..241284d 100644
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	18 --- a/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	19 +++ b/configure.ac
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	20 @@ -479,8 +479,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	21 GLIB_GNU_GETTEXT
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	22
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	23 if test "$gt_cv_have_gettext" != "yes" ; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	24 - AC_MSG_ERROR([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	25 -*** You must have either have gettext support in your C library, or use the
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	26 + AC_MSG_WARN([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	27 +*** You should have either have gettext support in your C library, or use the
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	28 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	29 ])
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	30 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	31 diff --git a/glib/gi18n.h b/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	32 index c710046..269bfdf 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	33 --- a/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	34 +++ b/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	35 @@ -22,7 +22,12 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	36
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	37 #include <glib.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	38
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	39 +#ifdef ENABLE_NLS
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	40 #include <libintl.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	41 +#else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	42 +#define gettext(String) (String)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	43 +#endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	44 +
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	45 #include <string.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	46
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	47 #define _(String) gettext (String)
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	48 --
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	49 1.7.10.4
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	50
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	51
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	52 From 6e19d772238eb429fe0ea77b65dbc9d8a5d89afa Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	53 From: "a@mxe.cc" <a@mxe.cc>
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	54 Date: Thu, 23 Sep 2010 21:42:46 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	55 Subject: [PATCH 2/8] fix tool paths
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	56
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	57 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	58 glib-2.0.pc.in \| 6 +++---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	59 1 file changed, 3 insertions(+), 3 deletions(-)
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	60
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	61 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	62 index 4a8898e..5164bae 100644
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	63 --- a/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	64 +++ b/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	65 @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	66 libdir=@libdir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	67 includedir=@includedir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	68
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	69 -glib_genmarshal=glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	70 -gobject_query=gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	71 -glib_mkenums=glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	72 +glib_genmarshal=@bindir@/glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	73 +gobject_query=@bindir@/gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	74 +glib_mkenums=@bindir@/glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	75
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	76 Name: GLib
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	77 Description: C Utility Library
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	78 --
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	79 1.7.10.4
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	80
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	81
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	82 From 556504bac07f4d80c0d9e50be1090f3ae02a653b Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	83 From: Hans Petter Jansson <hpj@cl.no>
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	84 Date: Fri, 15 Jun 2012 15:25:01 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	85 Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	86
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	87 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	88 gio/giomodule.c \| 6 +-----
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	89 glib/glib-init.c \| 6 +++---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	90 2 files changed, 4 insertions(+), 8 deletions(-)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	91
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	92 diff --git a/gio/giomodule.c b/gio/giomodule.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	93 index d8ce138..679279f 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	94 --- a/gio/giomodule.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	95 +++ b/gio/giomodule.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	96 @@ -782,10 +782,8 @@ extern GType _g_network_monitor_netlink_get_type (void);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	97
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	98 static HMODULE gio_dll = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	99
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	100 -#ifdef DLL_EXPORT
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	101 -
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	102 BOOL WINAPI
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	103 -DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	104 +gio_DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	105 DWORD fdwReason,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	106 LPVOID lpvReserved)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	107 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	108 @@ -801,8 +799,6 @@ _g_io_win32_get_module (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	109 return gio_dll;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	110 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	111
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	112 -#endif
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	113 -
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	114 #undef GIO_MODULE_DIR
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	115
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	116 /* GIO_MODULE_DIR is used only in code called just once,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	117 diff --git a/glib/glib-init.c b/glib/glib-init.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	118 index f4edd5c..02bf678 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	119 --- a/glib/glib-init.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	120 +++ b/glib/glib-init.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	121 @@ -226,9 +226,9 @@ glib_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	122 HMODULE glib_dll;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	123
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	124 BOOL WINAPI
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	125 -DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	126 - DWORD fdwReason,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	127 - LPVOID lpvReserved)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	128 +glib_DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	129 + DWORD fdwReason,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	130 + LPVOID lpvReserved)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	131 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	132 switch (fdwReason)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	133 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	134 --
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	135 1.7.10.4
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	136
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	137
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	138 From a83efeaa712bdfe43a1fcada6775ce2c89781631 Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	139 From: Hans Petter Jansson <hpj@cl.no>
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	140 Date: Fri, 15 Jun 2012 15:27:22 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	141 Subject: [PATCH 4/8] Allow building without inotify support
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	142
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	143 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	144 configure.ac \| 13 ++++++++++---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	145 1 file changed, 10 insertions(+), 3 deletions(-)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	146
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	147 diff --git a/configure.ac b/configure.ac
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	148 index 241284d..04d8590 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	149 --- a/configure.ac
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	150 +++ b/configure.ac
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	151 @@ -1700,11 +1700,18 @@ dnl *****************************
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	152 dnl Check for inotify (GIO)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	153 dnl *****************************
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	154 inotify_support=no
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	155 -AC_CHECK_HEADERS([sys/inotify.h],
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	156 -[
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	157 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	158 +AC_ARG_ENABLE(inotify,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	159 + AC_HELP_STRING([--disable-inotify],
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	160 + [build without inotify support]))
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	161 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	162 +if test "x$enable_inotify" != "xno"; then
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	163 + AC_CHECK_HEADERS([sys/inotify.h],
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	164 + [
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	165 inotify_support=yes
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	166 AC_CHECK_FUNCS(inotify_init1)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	167 -])
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	168 + ])
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	169 +fi
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	170
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	171 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	172
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	173 --
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	174 1.7.10.4
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	175
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	176
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	177 From e3d193f7e4f3d1ada0d65ccdccab1f28ef6d23d3 Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	178 From: Hans Petter Jansson <hpj@cl.no>
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	179 Date: Fri, 15 Jun 2012 15:28:14 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	180 Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	181 Backported from upstream
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	182
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	183 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	184 configure.ac \| 2 ++
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	185 1 file changed, 2 insertions(+)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	186
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	187 diff --git a/configure.ac b/configure.ac
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	188 index 04d8590..29b6252 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	189 --- a/configure.ac
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	190 +++ b/configure.ac
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	191 @@ -452,6 +452,8 @@ fi
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	192
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	193 AC_MSG_RESULT($enable_iconv_cache)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	194
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	195 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	196 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])])
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	197
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	198 dnl
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	199 dnl zlib support
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	200 --
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	201 1.7.10.4
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	202
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	203
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	204 From 08b493b8480f360ab21a0ce5c79b096392a389a8 Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	205 From: Hans Petter Jansson <hpj@cl.no>
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	206 Date: Fri, 15 Jun 2012 15:29:06 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	207 Subject: [PATCH 6/8] Link with dnsapi
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	208
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	209 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	210 gio-2.0.pc.in \| 2 +-
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	211 1 file changed, 1 insertion(+), 1 deletion(-)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	212
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	213 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	214 index 9f7123f..b0d5779 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	215 --- a/gio-2.0.pc.in
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	216 +++ b/gio-2.0.pc.in
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	217 @@ -13,6 +13,6 @@ Description: glib I/O library
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	218 Version: @VERSION@
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	219 Requires: glib-2.0 gobject-2.0
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	220 Requires.private: gmodule-no-export-2.0
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	221 -Libs: -L${libdir} -lgio-2.0
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	222 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	223 Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	224 Cflags:
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	225 --
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	226 1.7.10.4
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	227
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	228
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	229 From 645849d2055b1c7a46132a8b83739290b316ffba Mon Sep 17 00:00:00 2001
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	230 From: Hans Petter Jansson <hpj@cl.no>
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	231 Date: Fri, 15 Jun 2012 15:29:38 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	232 Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	233 being run
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	234
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	235 ---
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	236 glib/gmain.c \| 6 +++
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	237 glib/gthread-win32.c \| 106 ++++++++++++++++++++++++++++++++++++++++++++++++++
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	238 2 files changed, 112 insertions(+)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	239
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	240 diff --git a/glib/gmain.c b/glib/gmain.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	241 index 760f179..878ac14 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	242 --- a/glib/gmain.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	243 +++ b/glib/gmain.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	244 @@ -1981,12 +1981,15 @@ g_get_real_time (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	245 #ifdef G_OS_WIN32
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	246 static ULONGLONG (*g_GetTickCount64) (void) = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	247 static guint32 g_win32_tick_epoch = 0;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	248 +static gboolean g_win32_clock_is_initialized;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	249
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	250 G_GNUC_INTERNAL void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	251 g_clock_win32_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	252 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	253 HMODULE kernel32;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	254
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	255 + g_win32_clock_is_initialized = TRUE;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	256 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	257 g_GetTickCount64 = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	258 kernel32 = GetModuleHandle ("KERNEL32.DLL");
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	259 if (kernel32 != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	260 @@ -2105,6 +2108,9 @@ g_get_monotonic_time (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	261 * timeBeginPeriod() to increase it as much as they want
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	262 */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	263
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	264 + if (!g_win32_clock_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	265 + g_clock_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	266 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	267 if (g_GetTickCount64 != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	268 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	269 guint32 ticks_as_32bit;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	270 diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	271 index 5a9ac97..e4d1d48 100644
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	272 --- a/glib/gthread-win32.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	273 +++ b/glib/gthread-win32.c
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	274 @@ -117,18 +117,28 @@ typedef struct
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	275 void (__stdcall * WakeConditionVariable) (gpointer cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	276 } GThreadImplVtable;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	277
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	278 +/* Needed for static builds where DllMain initializer doesn't get called */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	279 +static gboolean g_threads_is_initialized;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	280 +G_GNUC_INTERNAL void g_thread_win32_init (void);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	281 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	282 static GThreadImplVtable g_thread_impl_vtable;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	283
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	284 /* {{{1 GMutex */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	285 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	286 g_mutex_init (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	287 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	288 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	289 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	290 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	291 g_thread_impl_vtable.InitializeSRWLock (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	292 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	293
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	294 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	295 g_mutex_clear (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	296 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	297 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	298 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	299 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	300 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	301 g_thread_impl_vtable.DeleteSRWLock (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	302 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	303 @@ -136,18 +146,27 @@ g_mutex_clear (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	304 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	305 g_mutex_lock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	306 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	307 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	308 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	309 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	310 g_thread_impl_vtable.AcquireSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	311 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	312
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	313 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	314 g_mutex_trylock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	315 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	316 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	317 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	318 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	319 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	320 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	321
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	322 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	323 g_mutex_unlock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	324 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	325 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	326 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	327 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	328 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	329 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	330
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	331 @@ -158,6 +177,9 @@ g_rec_mutex_impl_new (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	332 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	333 CRITICAL_SECTION *cs;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	334
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	335 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	336 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	337 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	338 cs = g_slice_new (CRITICAL_SECTION);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	339 InitializeCriticalSection (cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	340
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	341 @@ -168,6 +190,10 @@ static void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	342 g_rec_mutex_impl_free (CRITICAL_SECTION *cs)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	343 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	344 DeleteCriticalSection (cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	345 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	346 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	347 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	348 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	349 g_slice_free (CRITICAL_SECTION, cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	350 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	351
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	352 @@ -176,6 +202,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	353 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	354 CRITICAL_SECTION *impl = mutex->p;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	355
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	356 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	357 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	358 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	359 if G_UNLIKELY (mutex->p == NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	360 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	361 impl = g_rec_mutex_impl_new ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	362 @@ -190,30 +219,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	363 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	364 g_rec_mutex_init (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	365 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	366 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	367 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	368 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	369 mutex->p = g_rec_mutex_impl_new ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	370 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	371
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	372 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	373 g_rec_mutex_clear (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	374 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	375 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	376 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	377 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	378 g_rec_mutex_impl_free (mutex->p);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	379 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	380
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	381 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	382 g_rec_mutex_lock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	383 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	384 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	385 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	386 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	387 EnterCriticalSection (g_rec_mutex_get_impl (mutex));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	388 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	389
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	390 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	391 g_rec_mutex_unlock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	392 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	393 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	394 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	395 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	396 LeaveCriticalSection (mutex->p);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	397 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	398
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	399 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	400 g_rec_mutex_trylock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	401 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	402 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	403 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	404 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	405 return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	406 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	407
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	408 @@ -222,12 +266,18 @@ g_rec_mutex_trylock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	409 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	410 g_rw_lock_init (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	411 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	412 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	413 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	414 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	415 g_thread_impl_vtable.InitializeSRWLock (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	416 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	417
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	418 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	419 g_rw_lock_clear (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	420 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	421 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	422 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	423 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	424 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	425 g_thread_impl_vtable.DeleteSRWLock (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	426 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	427 @@ -235,36 +285,54 @@ g_rw_lock_clear (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	428 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	429 g_rw_lock_writer_lock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	430 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	431 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	432 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	433 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	434 g_thread_impl_vtable.AcquireSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	435 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	436
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	437 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	438 g_rw_lock_writer_trylock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	439 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	440 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	441 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	442 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	443 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	444 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	445
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	446 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	447 g_rw_lock_writer_unlock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	448 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	449 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	450 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	451 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	452 g_thread_impl_vtable.ReleaseSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	453 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	454
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	455 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	456 g_rw_lock_reader_lock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	457 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	458 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	459 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	460 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	461 g_thread_impl_vtable.AcquireSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	462 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	463
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	464 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	465 g_rw_lock_reader_trylock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	466 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	467 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	468 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	469 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	470 return g_thread_impl_vtable.TryAcquireSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	471 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	472
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	473 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	474 g_rw_lock_reader_unlock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	475 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	476 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	477 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	478 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	479 g_thread_impl_vtable.ReleaseSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	480 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	481
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	482 @@ -272,12 +340,18 @@ g_rw_lock_reader_unlock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	483 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	484 g_cond_init (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	485 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	486 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	487 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	488 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	489 g_thread_impl_vtable.InitializeConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	490 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	491
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	492 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	493 g_cond_clear (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	494 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	495 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	496 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	497 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	498 if (g_thread_impl_vtable.DeleteConditionVariable)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	499 g_thread_impl_vtable.DeleteConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	500 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	501 @@ -285,12 +359,18 @@ g_cond_clear (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	502 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	503 g_cond_signal (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	504 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	505 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	506 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	507 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	508 g_thread_impl_vtable.WakeConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	509 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	510
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	511 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	512 g_cond_broadcast (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	513 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	514 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	515 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	516 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	517 g_thread_impl_vtable.WakeAllConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	518 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	519
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	520 @@ -298,6 +378,9 @@ void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	521 g_cond_wait (GCond *cond,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	522 GMutex *entered_mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	523 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	524 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	525 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	526 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	527 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	528 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	529
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	530 @@ -308,6 +391,9 @@ g_cond_wait_until (GCond *cond,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	531 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	532 gint64 span;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	533
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	534 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	535 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	536 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	537 span = end_time - g_get_monotonic_time ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	538
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	539 if G_UNLIKELY (span < 0)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	540 @@ -340,6 +426,9 @@ g_private_get_impl (GPrivate *key)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	541
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	542 if G_UNLIKELY (impl == 0)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	543 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	544 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	545 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	546 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	547 EnterCriticalSection (&g_private_lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	548 impl = (DWORD) key->p;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	549 if (impl == 0)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	550 @@ -433,6 +522,9 @@ g_system_thread_free (GRealThread *thread)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	551 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	552 GThreadWin32 wt = (GThreadWin32 ) thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	553
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	554 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	555 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	556 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	557 win32_check_for_error (CloseHandle (wt->handle));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	558 g_slice_free (GThreadWin32, wt);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	559 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	560 @@ -440,6 +532,9 @@ g_system_thread_free (GRealThread *thread)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	561 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	562 g_system_thread_exit (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	563 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	564 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	565 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	566 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	567 _endthreadex (0);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	568 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	569
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	570 @@ -448,6 +543,9 @@ g_thread_win32_proxy (gpointer data)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	571 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	572 GThreadWin32 *self = data;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	573
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	574 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	575 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	576 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	577 self->proxy (self);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	578
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	579 g_system_thread_exit ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	580 @@ -465,6 +563,9 @@ g_system_thread_new (GThreadFunc func,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	581 GThreadWin32 *thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	582 guint ignore;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	583
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	584 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	585 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	586 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	587 thread = g_slice_new0 (GThreadWin32);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	588 thread->proxy = func;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	589
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	590 @@ -494,6 +595,9 @@ g_system_thread_wait (GRealThread *thread)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	591 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	592 GThreadWin32 wt = (GThreadWin32 ) thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	593
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	594 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	595 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	596 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	597 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	598 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	599
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	600 @@ -985,6 +1089,8 @@ g_thread_lookup_native_funcs (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	601 G_GNUC_INTERNAL void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	602 g_thread_win32_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	603 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	604 + g_threads_is_initialized = TRUE;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	605 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	606 if (!g_thread_lookup_native_funcs ())
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	607 g_thread_xp_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	608
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	609 --
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	610 1.7.10.4
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	611
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	612
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	613 From e6c9e1075e9c176d0184cff07d6f2eef224ab608 Mon Sep 17 00:00:00 2001
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	614 From: Mark Brand <mabrand@mabrand.nl>
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	615 Date: Mon, 18 Jun 2012 16:02:12 +0200
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	616 Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	617
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	618 ---
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	619 Makefile.am \| 5 +-
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	620 autogen.sh \| 7 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	621 configure.ac \| 2 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	622 docs/Makefile.am \| 11 --
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	623 docs/reference/Makefile.am \| 3 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	624 docs/reference/gio/Makefile.am \| 181 --------------------
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	625 .../gio/gdbus-object-manager-example/Makefile.am \| 68 --------
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	626 docs/reference/glib/Makefile.am \| 129 --------------
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	627 docs/reference/gobject/Makefile.am \| 103 -----------
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	628 9 files changed, 2 insertions(+), 507 deletions(-)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	629 delete mode 100644 docs/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	630 delete mode 100644 docs/reference/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	631 delete mode 100644 docs/reference/gio/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	632 delete mode 100644 docs/reference/gio/gdbus-object-manager-example/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	633 delete mode 100644 docs/reference/glib/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	634 delete mode 100644 docs/reference/gobject/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	635
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	636 diff --git a/Makefile.am b/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	637 index f5c510d..28d77c6 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	638 --- a/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	639 +++ b/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	640 @@ -6,7 +6,7 @@ include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	641
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	642 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	643
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	644 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	645 +SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	646 DIST_SUBDIRS = $(SUBDIRS) build
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	647
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	648 bin_SCRIPTS = glib-gettextize
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	649 @@ -62,8 +62,7 @@ BUILT_EXTRA_DIST = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	650 README \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	651 INSTALL \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	652 ChangeLog \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	653 - config.h.win32 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	654 - gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	655 + config.h.win32
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	656
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	657 CONFIGURE_DEPENDENCIES = acglib.m4
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	658
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	659 diff --git a/autogen.sh b/autogen.sh
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	660 index 01011d9..bc0ab0b 100755
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	661 --- a/autogen.sh
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	662 +++ b/autogen.sh
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	663 @@ -7,12 +7,6 @@ test -n "$srcdir" \|\| srcdir=.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	664 olddir=`pwd`
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	665 cd "$srcdir"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	666
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	667 -GTKDOCIZE=`which gtkdocize`
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	668 -if test -z $GTKDOCIZE; then
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	669 - echo "* No GTK-Doc found, please install it *"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	670 - exit 1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	671 -fi
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	672 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	673 AUTORECONF=`which autoreconf`
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	674 if test -z $AUTORECONF; then
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	675 echo "* No autoreconf found, please install it *"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	676 @@ -24,7 +18,6 @@ fi
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	677 # regenerated from their corresponding *.in files by ./configure anyway.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	678 touch README INSTALL
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	679
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	680 -gtkdocize \|\| exit $?
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	681 autoreconf --force --install --verbose \|\| exit $?
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	682
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	683 cd "$olddir"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	684 diff --git a/configure.ac b/configure.ac
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	685 index 29b6252..24a0c3c 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	686 --- a/configure.ac
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	687 +++ b/configure.ac
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	688 @@ -2598,8 +2598,6 @@ dnl **************************
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	689 dnl * Checks for gtk-doc *
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	690 dnl **************************
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	691
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	692 -GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	693 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	694 AC_ARG_ENABLE(man,
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	695 [AC_HELP_STRING([--enable-man],
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	696 [regenerate man pages from Docbook [default=no]])],enable_man=yes,
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	697 diff --git a/docs/Makefile.am b/docs/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	698 deleted file mode 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	699 index 2349f44..0000000
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	700 --- a/docs/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	701 +++ /dev/null
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	702 @@ -1,11 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	703 -## Process this file with automake to produce Makefile.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	704 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	705 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	706 -SUBDIRS = reference
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	707 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	708 -EXTRA_DIST += debugging.txt macros.txt
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	709 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	710 -files:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	711 - @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	712 - echo $$p; \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	713 - done
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	714 diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	715 deleted file mode 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	716 index 63cf90d..0000000
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	717 --- a/docs/reference/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	718 +++ /dev/null
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	719 @@ -1,3 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	720 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	721 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	722 -SUBDIRS = glib gobject gio
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	723 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	724 deleted file mode 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	725 index 7d2d264..0000000
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	726 --- a/docs/reference/gio/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	727 +++ /dev/null
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	728 @@ -1,181 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	729 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	730 -NULL =
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	731 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	732 -SUBDIRS = gdbus-object-manager-example
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	733 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	734 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	735 -DOC_MODULE=gio
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	736 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	737 -# The top-level SGML file.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	738 -DOC_MAIN_SGML_FILE=gio-docs.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	739 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	740 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	741 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	742 - --ignore-decorators="G_GNUC_WARN_UNUSED_RESULT"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	743 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	744 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	745 -DOC_SOURCE_DIR=$(top_srcdir)/gio
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	746 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	747 -BUILT_HFILES=gioenumtypes.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	748 -HFILE_GLOB=$(top_srcdir)/gio/*.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	749 -CFILE_GLOB=$(top_srcdir)/gio/*.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	750 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	751 -IGNORE_HFILES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	752 - fam \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	753 - fen \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	754 - gdbus-2.0 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	755 - gvdb \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	756 - inotify \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	757 - libasyncns \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	758 - tests \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	759 - win32 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	760 - xdgmime \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	761 - gapplicationimpl.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	762 - gasynchelper.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	763 - gcontenttypeprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	764 - gdbusauth.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	765 - gdbusauthmechanismanon.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	766 - gdbusauthmechanismexternal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	767 - gdbusauthmechanism.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	768 - gdbusauthmechanismsha1.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	769 - gdbusprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	770 - gdelayedsettingsbackend.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	771 - gdummyfile.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	772 - gdummyproxyresolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	773 - gdummytlsbackend.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	774 - gfileattribute-priv.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	775 - gfileinfo-priv.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	776 - giomodule-priv.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	777 - glocaldirectorymonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	778 - glocalfileenumerator.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	779 - glocalfile.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	780 - glocalfileinfo.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	781 - glocalfileinputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	782 - glocalfileiostream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	783 - glocalfilemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	784 - glocalfileoutputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	785 - glocalvfs.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	786 - gmountprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	787 - gnativevolumemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	788 - gnetworkingprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	789 - gnetworkmonitorbase.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	790 - gnetworkmonitornetlink.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	791 - gpollfilemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	792 - gregistrysettingsbackend.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	793 - gsettingsbackendinternal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	794 - gsettings-mapping.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	795 - gsettingsschema-internal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	796 - gsocketinputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	797 - gsocketoutputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	798 - gsocks4aproxy.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	799 - gsocks4proxy.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	800 - gsocks5proxy.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	801 - gthreadedresolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	802 - gunionvolumemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	803 - gunixmount.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	804 - gunixresolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	805 - gunixvolume.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	806 - gunixvolumemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	807 - gwin32appinfo.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	808 - gwin32mount.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	809 - gwin32resolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	810 - gwin32volumemonitor.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	811 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	812 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	813 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	814 -# if $(DOC_MODULE).types is non-empty.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	815 -INCLUDES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	816 - $(gio_INCLUDES) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	817 - $(GLIB_DEBUG_FLAGS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	818 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	819 -GTKDOC_LIBS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	820 - $(top_builddir)/glib/libglib-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	821 - $(top_builddir)/gobject/libgobject-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	822 - $(top_builddir)/gmodule/libgmodule-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	823 - $(top_builddir)/gio/libgio-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	824 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	825 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	826 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	827 -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	828 - --ignore-files='libasyncns tests'
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	829 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	830 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	831 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	832 - gvfs-overview.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	833 - menu-example.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	834 - menu-model.png
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	835 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	836 -content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	837 - version.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	838 - overview.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	839 - migrating-posix.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	840 - migrating-gnome-vfs.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	841 - migrating-gconf.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	842 - migrating-gdbus.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	843 - gio-querymodules.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	844 - glib-compile-schemas.xml\
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	845 - glib-compile-resources.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	846 - gsettings.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	847 - gresource.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	848 - gdbus.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	849 - gdbus-codegen.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	850 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	851 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	852 -expand_content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	853 - overview.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	854 - migrating-posix.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	855 - migrating-gnome-vfs.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	856 - migrating-gconf.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	857 - migrating-gdbus.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	858 - gdbus-codegen.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	859 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	860 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	861 -extra_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	862 - version.xml.in \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	863 - gvfs-overview.odg
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	864 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	865 -# Extra options to supply to gtkdoc-fixref
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	866 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html --extra-dir=$(srcdir)/../gobject/html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	867 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	868 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	869 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	870 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	871 - version.xml.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	872 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	873 -man_MANS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	874 - gio-querymodules.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	875 - glib-compile-schemas.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	876 - glib-compile-resources.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	877 - gsettings.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	878 - gresource.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	879 - gdbus.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	880 - gdbus-codegen.1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	881 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	882 -if ENABLE_MAN
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	883 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	884 -.xml.1:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	885 - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	886 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	887 -dist-local-check-mans-enabled:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	888 - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	889 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	890 -else
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	891 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	892 -$(man_MANS):
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	893 - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	894 - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	895 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	896 -dist-local-check-mans-enabled:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	897 - echo "*** --enable-man must be used in order to make dist"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	898 - false
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	899 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	900 -endif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	901 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	902 -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	903 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	904 -EXTRA_DIST += $(man_MANS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	905 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	906 -dist-hook-local: dist-local-check-mans-enabled all-local
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	907 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	908 -gio-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	909 - cd $(srcdir) && rm -rf xml html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	910 diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	911 deleted file mode 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	912 index 90c10aa..0000000
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	913 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	914 +++ /dev/null
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	915 @@ -1,68 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	916 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	917 -NULL =
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	918 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	919 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	920 -DOC_MODULE=gdbus-object-manager-example
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	921 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	922 -# The top-level SGML file.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	923 -DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	924 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	925 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	926 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	927 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	928 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	929 -DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	930 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	931 -HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	932 -CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	933 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	934 -# Headers to ignore
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	935 -IGNORE_HFILES= \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	936 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	937 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	938 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	939 -# if $(DOC_MODULE).types is non-empty.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	940 -INCLUDES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	941 - $(gio_INCLUDES) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	942 - $(GLIB_DEBUG_FLAGS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	943 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	944 -GTKDOC_LIBS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	945 - $(top_builddir)/glib/libglib-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	946 - $(top_builddir)/gobject/libgobject-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	947 - $(top_builddir)/gmodule/libgmodule-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	948 - $(top_builddir)/gio/libgio-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	949 - $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	950 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	951 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	952 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	953 -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	954 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	955 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	956 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	957 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	958 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	959 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	960 -content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	961 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	962 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	963 -expand_content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	964 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	965 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	966 -extra_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	967 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	968 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	969 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	970 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	971 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	972 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	973 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	974 -MAINTAINERCLEANFILES = $(BUILT_SOURCES)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	975 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	976 -dist-hook-local: all-local
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	977 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	978 -gdbus-object-manager-example-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	979 - cd $(srcdir) && rm -rf xml html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	980 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	981 -# Nuke installed docs (don't know how to avoid installing them)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	982 -install-data-hook :
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	983 - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	984 diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	985 deleted file mode 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	986 index 2ceae09..0000000
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	987 --- a/docs/reference/glib/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	988 +++ /dev/null
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	989 @@ -1,129 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	990 -## Process this file with automake to produce Makefile.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	991 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	992 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	993 -AUTOMAKE_OPTIONS = 1.6
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	994 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	995 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	996 -DOC_MODULE=glib
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	997 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	998 -# The top-level SGML file.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	999 -DOC_MAIN_SGML_FILE=glib-docs.sgml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1000 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1001 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1002 -DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1003 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1004 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1005 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR\|G_GNUC_WARN_UNUSED_RESULT"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1006 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1007 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1008 -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1009 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1010 -# Used for dependencies
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1011 -HFILE_GLOB=$(top_srcdir)/glib/.h $(top_srcdir)/gmodule/.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1012 -CFILE_GLOB=$(top_srcdir)/glib/.c $(top_srcdir)/gmodule/.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1013 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1014 -# Ignore some private headers
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1015 -IGNORE_HFILES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1016 - gallocator.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1017 - gdatasetprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1018 - glibintl.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1019 - gbsearcharray.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1020 - glib-private.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1021 - gmoduleconf.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1022 - gthreadprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1023 - gunibreak.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1024 - gunicomp.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1025 - gunidecomp.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1026 - gunichartables.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1027 - glib_probes.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1028 - glib_trace.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1029 - libcharset.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1030 - gdebug.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1031 - gprintfint.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1032 - gmirroringtable.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1033 - gscripttable.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1034 - glib-mirroring-tab \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1035 - gnulib \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1036 - pcre \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1037 - update-pcre \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1038 - gbytesprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1039 - gvariant-internal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1040 - gvariant-serialiser.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1041 - gvariant-core.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1042 - gvarianttypeinfo.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1043 - gwakeup.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1044 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1045 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1046 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1047 - file-name-encodings.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1048 - mainloop-states.gif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1049 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1050 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1051 -content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1052 - cross.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1053 - running.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1054 - building.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1055 - changes.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1056 - compiling.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1057 - resources.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1058 - regex-syntax.sgml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1059 - version.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1060 - glib-gettextize.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1061 - gtester.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1062 - gtester-report.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1063 - gvariant-varargs.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1064 - gvariant-text.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1065 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1066 -expand_content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1067 - compiling.sgml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1068 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1069 -# Extra options to supply to gtkdoc-fixref
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1070 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../gobject/html --extra-dir=$(srcdir)/../gio/html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1071 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1072 -# include common portion ...
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1073 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1074 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1075 -# Other files to distribute
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1076 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1077 - file-name-encodings.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1078 - file-name-encodings.sxd \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1079 - mainloop-states.fig \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1080 - mainloop-states.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1081 - mainloop-states.eps \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1082 - version.xml.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1083 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1084 -########################################################################
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1085 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1086 -man_MANS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1087 - glib-gettextize.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1088 - gtester.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1089 - gtester-report.1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1090 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1091 -if ENABLE_MAN
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1092 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1093 -.xml.1:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1094 - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1095 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1096 -dist-local-check-mans-enabled:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1097 - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1098 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1099 -else
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1100 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1101 -$(man_MANS):
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1102 - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1103 - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1104 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1105 -dist-local-check-mans-enabled:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1106 - echo "*** --enable-man must be used in order to make dist"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1107 - false
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1108 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1109 -endif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1110 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1111 -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1112 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1113 -EXTRA_DIST += $(man_MANS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1114 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1115 -dist-hook-local: dist-local-check-mans-enabled all-local
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1116 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1117 -glib-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1118 - cd $(srcdir) && rm -rf xml html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1119 diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1120 deleted file mode 100644
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1121 index 3a637b7..0000000
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1122 --- a/docs/reference/gobject/Makefile.am
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1123 +++ /dev/null
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1124 @@ -1,103 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1125 -## Process this file with automake to produce Makefile.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1126 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1127 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1128 -AUTOMAKE_OPTIONS = 1.6
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1129 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1130 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1131 -DOC_MODULE=gobject
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1132 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1133 -# The top-level SGML file.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1134 -DOC_MAIN_SGML_FILE=gobject-docs.sgml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1135 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1136 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1137 -DOC_SOURCE_DIR=$(top_srcdir)/gobject
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1138 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1139 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1140 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1141 - --ignore-decorators="G_GNUC_INTERNAL\|G_GNUC_WARN_UNUSED_RESULT"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1142 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1143 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1144 -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1145 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1146 -# Used for dependencies
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1147 -HFILE_GLOB=$(top_srcdir)/gobject/*.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1148 -CFILE_GLOB=$(top_srcdir)/gobject/*.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1149 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1150 -# Headers to ignore
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1151 -IGNORE_HFILES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1152 - tests \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1153 - gobject_trace.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1154 - gatomicarray.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1155 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1156 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1157 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1158 -# if $(DOC_MODULE).types is non-empty.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1159 -INCLUDES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1160 - -I$(srcdir) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1161 - $(gobject_INCLUDES) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1162 - $(GLIB_DEBUG_FLAGS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1163 -GTKDOC_LIBS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1164 - $(top_builddir)/glib/libglib-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1165 - $(top_builddir)/gobject/libgobject-2.0.la
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1166 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1167 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1168 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1169 - images/glue.png
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1170 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1171 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1172 -content_files = version.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1173 - glib-mkenums.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1174 - glib-genmarshal.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1175 - gobject-query.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1176 - tut_gobject.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1177 - tut_gsignal.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1178 - tut_gtype.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1179 - tut_howto.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1180 - tut_intro.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1181 - tut_tools.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1182 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1183 -# Extra options to supply to gtkdoc-fixref
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1184 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1185 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1186 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1187 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1188 -# Other files to distribute
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1189 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1190 - gobject.cI \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1191 - version.xml.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1192 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1193 -########################################################################
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1194 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1195 -man_MANS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1196 - glib-mkenums.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1197 - glib-genmarshal.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1198 - gobject-query.1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1199 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1200 -if ENABLE_MAN
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1201 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1202 -.xml.1:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1203 - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1204 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1205 -dist-local-check-mans-enabled:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1206 - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1207 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1208 -else
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1209 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1210 -$(man_MANS):
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1211 - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1212 - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1213 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1214 -dist-local-check-mans-enabled:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1215 - echo "*** --enable-man must be used in order to make dist"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1216 - false
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1217 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1218 -endif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1219 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1220 -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1221 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1222 -EXTRA_DIST += $(man_MANS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1223 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1224 -dist-hook-local: dist-local-check-mans-enabled all-local
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1225 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1226 -gobject-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1227 - cd $(srcdir) && rm -rf xml html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1228 --
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1229 1.7.10.4
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1230

Mercurial > mxe-octave

annotate src/glib-1-fixes.patch @ 2635:383ab5d1e69f