Mercurial > mxe-octave

comparison src/mingw-glib-1-fixes.patch @ 3183:96e96221fe09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update glib mingw native and cross compile * src/mingw-glib-2-fixes.patch: New file for MemoryBarrier call. * src/mingw-glib-1-fixes.patch: update to use latest mxe devel branch glib patch. * src/glib.mk: run autogen.sh on native build, build just cross version of everything if cross mingw.
author John Donoghue <john.donoghue@ieee.org>
date Mon, 29 Jul 2013 13:54:19 -0400
parents 2733829a184e
children 436a81e04861
comparison
equal deleted inserted replaced
3182:23a5b6df3061 3183:96e96221fe09
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From eacb3702acc44de8e5a3c9a324cb9a81333e3737 Mon Sep 17 00:00:00 2001 6 From 55d5dab8f12c55064b48da8a4a42bfe8fa97f8f9 Mon Sep 17 00:00:00 2001
7 From: "a@mxe.cc" <a@mxe.cc> 7 From: MXE
8 Date: Thu, 23 Sep 2010 21:41:51 +0200 8 Date: Thu, 23 Sep 2010 21:41:51 +0200
9 Subject: [PATCH 1/8] optional gettext 9 Subject: [PATCH 1/8] optional gettext
10 10
11 11
12 diff --git a/configure.ac b/configure.ac 12 diff -ur a/configure.ac b/configure.ac
13 index 054485f..9321fbc 100644 13 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
14 --- a/configure.ac 14 +++ b/configure.ac 2013-06-29 05:15:59.920660258 +0200
15 +++ b/configure.ac 15 @@ -483,8 +483,8 @@
16 @@ -482,8 +482,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
17 GLIB_GNU_GETTEXT 16 GLIB_GNU_GETTEXT
18 17
19 if test "$gt_cv_have_gettext" != "yes" ; then 18 if test "$gt_cv_have_gettext" != "yes" ; then
20 - AC_MSG_ERROR([ 19 - AC_MSG_ERROR([
21 -*** You must have either have gettext support in your C library, or use the 20 -*** You must have either have gettext support in your C library, or use the
22 + AC_MSG_WARN([ 21 + AC_MSG_WARN([
23 +*** You should have either have gettext support in your C library, or use the 22 +*** You should have either have gettext support in your C library, or use the
24 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html 23 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
25 ]) 24 ])
26 fi 25 fi
27 diff --git a/glib/gi18n.h b/glib/gi18n.h 26 diff -ur a/glib/gi18n.h b/glib/gi18n.h
28 index c710046..269bfdf 100644 27 --- a/glib/gi18n.h 2011-08-16 02:51:30.000000000 +0200
29 --- a/glib/gi18n.h 28 +++ b/glib/gi18n.h 2013-06-29 05:17:17.620663625 +0200
30 +++ b/glib/gi18n.h
31 @@ -22,7 +22,12 @@ 29 @@ -22,7 +22,12 @@
32 30
33 #include <glib.h> 31 #include <glib.h>
34 32
35 +#ifdef ENABLE_NLS 33 +#ifdef ENABLE_NLS
39 +#endif 37 +#endif
40 + 38 +
41 #include <string.h> 39 #include <string.h>
42 40
43 #define _(String) gettext (String) 41 #define _(String) gettext (String)
44 -- 42
45 1.7.10.4 43
46 44 From 4dee17aeb7c45a84a44e3fe2dcca4d8bfd1916a3 Mon Sep 17 00:00:00 2001
47 45 From: MXE
48 From c88a15fbac3076f772894ebcd2003786b37603d4 Mon Sep 17 00:00:00 2001
49 From: "a@mxe.cc" <a@mxe.cc>
50 Date: Thu, 23 Sep 2010 21:42:46 +0200 46 Date: Thu, 23 Sep 2010 21:42:46 +0200
51 Subject: [PATCH 2/8] fix tool paths 47 Subject: [PATCH 2/8] fix tool paths
52 48
53 49
54 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in 50 diff -ur a/glib-2.0.pc.in b/glib-2.0.pc.in
55 index 4a8898e..5164bae 100644 51 --- a/glib-2.0.pc.in 2012-03-12 01:42:41.000000000 +0100
56 --- a/glib-2.0.pc.in 52 +++ b/glib-2.0.pc.in 2013-06-29 05:18:02.624665578 +0200
57 +++ b/glib-2.0.pc.in 53 @@ -3,9 +3,9 @@
58 @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
59 libdir=@libdir@ 54 libdir=@libdir@
60 includedir=@includedir@ 55 includedir=@includedir@
61 56
62 -glib_genmarshal=glib-genmarshal 57 -glib_genmarshal=glib-genmarshal
63 -gobject_query=gobject-query 58 -gobject_query=gobject-query
66 +gobject_query=@bindir@/gobject-query 61 +gobject_query=@bindir@/gobject-query
67 +glib_mkenums=@bindir@/glib-mkenums 62 +glib_mkenums=@bindir@/glib-mkenums
68 63
69 Name: GLib 64 Name: GLib
70 Description: C Utility Library 65 Description: C Utility Library
71 -- 66
72 1.7.10.4 67
73 68 From 981260cfec055fbd58986d9e1b7ef27cdc036e30 Mon Sep 17 00:00:00 2001
74 69 From: MXE
75 From fdf03eb9fff0532fa6dea660a5665242f6ccac9e Mon Sep 17 00:00:00 2001
76 From: Hans Petter Jansson <hpj@cl.no>
77 Date: Fri, 15 Jun 2012 15:25:01 +0200 70 Date: Fri, 15 Jun 2012 15:25:01 +0200
78 Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically 71 Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically
79 72
80 73
81 diff --git a/gio/giomodule.c b/gio/giomodule.c 74 diff -ur a/gio/giomodule.c b/gio/giomodule.c
82 index 37a9e70..2e5ef9b 100644 75 --- a/gio/giomodule.c 2013-06-03 01:20:49.000000000 +0200
83 --- a/gio/giomodule.c 76 +++ b/gio/giomodule.c 2013-06-29 05:19:55.560670478 +0200
84 +++ b/gio/giomodule.c 77 @@ -900,14 +900,12 @@
85 @@ -782,10 +782,8 @@ extern GType _g_network_monitor_netlink_get_type (void);
86 78
87 static HMODULE gio_dll = NULL; 79 static HMODULE gio_dll = NULL;
88 80
89 -#ifdef DLL_EXPORT 81 -#ifdef DLL_EXPORT
90 - 82 -
83 -BOOL WINAPI DllMain (HINSTANCE hinstDLL,
84 +BOOL WINAPI gio_DllMain (HINSTANCE hinstDLL,
85 DWORD fdwReason,
86 LPVOID lpvReserved);
87
91 BOOL WINAPI 88 BOOL WINAPI
92 -DllMain (HINSTANCE hinstDLL, 89 -DllMain (HINSTANCE hinstDLL,
93 +gio_DllMain (HINSTANCE hinstDLL, 90 +gio_DllMain (HINSTANCE hinstDLL,
94 DWORD fdwReason, 91 DWORD fdwReason,
95 LPVOID lpvReserved) 92 LPVOID lpvReserved)
96 { 93 {
97 @@ -801,8 +799,6 @@ _g_io_win32_get_module (void) 94 @@ -917,8 +915,6 @@
98 return gio_dll; 95 return TRUE;
99 } 96 }
100 97
101 -#endif 98 -#endif
102 - 99 -
103 #undef GIO_MODULE_DIR 100 void *
104 101 _g_io_win32_get_module (void)
105 /* GIO_MODULE_DIR is used only in code called just once, 102 {
106 diff --git a/glib/glib-init.c b/glib/glib-init.c 103 diff -ur a/glib/glib-init.c b/glib/glib-init.c
107 index f4edd5c..02bf678 100644 104 --- a/glib/glib-init.c 2013-06-10 00:03:17.000000000 +0200
108 --- a/glib/glib-init.c 105 +++ b/glib/glib-init.c 2013-06-29 05:20:43.480672556 +0200
109 +++ b/glib/glib-init.c 106 @@ -223,14 +223,14 @@
110 @@ -226,9 +226,9 @@ glib_init (void) 107
108 #if defined (G_OS_WIN32)
109
110 -BOOL WINAPI DllMain (HINSTANCE hinstDLL,
111 +BOOL WINAPI glib_DllMain (HINSTANCE hinstDLL,
112 DWORD fdwReason,
113 LPVOID lpvReserved);
114
111 HMODULE glib_dll; 115 HMODULE glib_dll;
112 116
113 BOOL WINAPI 117 BOOL WINAPI
114 -DllMain (HINSTANCE hinstDLL, 118 -DllMain (HINSTANCE hinstDLL,
115 - DWORD fdwReason,
116 - LPVOID lpvReserved)
117 +glib_DllMain (HINSTANCE hinstDLL, 119 +glib_DllMain (HINSTANCE hinstDLL,
118 + DWORD fdwReason, 120 DWORD fdwReason,
119 + LPVOID lpvReserved) 121 LPVOID lpvReserved)
120 { 122 {
121 switch (fdwReason) 123
122 { 124
123 -- 125 From 1b51f3ef3e38d5db3c15cde0fe4429dab1f7a6d0 Mon Sep 17 00:00:00 2001
124 1.7.10.4 126 From: MXE
125
126
127 From 64c337b9654441cc1b90ed3ac86f928073ec208e Mon Sep 17 00:00:00 2001
128 From: Hans Petter Jansson <hpj@cl.no>
129 Date: Fri, 15 Jun 2012 15:27:22 +0200 127 Date: Fri, 15 Jun 2012 15:27:22 +0200
130 Subject: [PATCH 4/8] Allow building without inotify support 128 Subject: [PATCH 4/8] Allow building without inotify support
131 129
132 130
133 diff --git a/configure.ac b/configure.ac 131 diff -ur a/configure.ac b/configure.ac
134 index 9321fbc..5c6bb3e 100644 132 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
135 --- a/configure.ac 133 +++ b/configure.ac 2013-06-29 05:23:45.264680443 +0200
136 +++ b/configure.ac 134 @@ -1726,11 +1726,17 @@
137 @@ -1712,11 +1712,18 @@ dnl *****************************
138 dnl ** Check for inotify (GIO) ** 135 dnl ** Check for inotify (GIO) **
139 dnl ***************************** 136 dnl *****************************
140 inotify_support=no 137 inotify_support=no
141 -AC_CHECK_HEADERS([sys/inotify.h], 138 -AC_CHECK_HEADERS([sys/inotify.h],
142 -[ 139 -[
143 +
144 +AC_ARG_ENABLE(inotify, 140 +AC_ARG_ENABLE(inotify,
145 + AC_HELP_STRING([--disable-inotify], 141 + AC_HELP_STRING([--disable-inotify],
146 + [build without inotify support])) 142 + [build without inotify support]))
147 + 143 +
148 +if test "x$enable_inotify" != "xno"; then 144 +if test "x$enable_inotify" != "xno"; then
149 + AC_CHECK_HEADERS([sys/inotify.h], 145 + AC_CHECK_HEADERS([sys/inotify.h],
150 + [ 146 + [
151 inotify_support=yes 147 inotify_support=yes
152 AC_CHECK_FUNCS(inotify_init1) 148 AC_CHECK_FUNCS(inotify_init1)
153 -]) 149 -])
154 + ]) 150 + ])
155 +fi 151 +fi
156 152
157 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) 153 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])
158 154
159 -- 155
160 1.7.10.4 156
161 157 From 5ec5d101cb75c096f39228da85d2caba52b9002f Mon Sep 17 00:00:00 2001
162 158 From: MXE
163 From c80c435bd8d92857eeb54273024ca8782fa089c6 Mon Sep 17 00:00:00 2001
164 From: Hans Petter Jansson <hpj@cl.no>
165 Date: Fri, 15 Jun 2012 15:28:14 +0200 159 Date: Fri, 15 Jun 2012 15:28:14 +0200
166 Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. 160 Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
167 Backported from upstream 161 Backported from upstream
168 162
169 163
170 diff --git a/configure.ac b/configure.ac 164 diff -ur a/configure.ac b/configure.ac
171 index 5c6bb3e..8754c21 100644 165 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
172 --- a/configure.ac 166 +++ b/configure.ac 2013-06-29 05:24:29.720682366 +0200
173 +++ b/configure.ac 167 @@ -456,6 +456,8 @@
174 @@ -455,6 +455,8 @@ fi
175 168
176 AC_MSG_RESULT($enable_iconv_cache) 169 AC_MSG_RESULT($enable_iconv_cache)
177 170
178 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF 171 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF
179 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])]) 172 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])])
180 173
181 dnl 174 dnl
182 dnl zlib support 175 dnl zlib support
183 -- 176
184 1.7.10.4 177
185 178 From d5c7bf3b57ced0c6dfb416cf7b439fba210d2a8b Mon Sep 17 00:00:00 2001
186 179 From: MXE
187 From e7e2c1c881813a2a17bfec7b63c673eb979b3833 Mon Sep 17 00:00:00 2001
188 From: Hans Petter Jansson <hpj@cl.no>
189 Date: Fri, 15 Jun 2012 15:29:06 +0200 180 Date: Fri, 15 Jun 2012 15:29:06 +0200
190 Subject: [PATCH 6/8] Link with dnsapi 181 Subject: [PATCH 6/8] Link with dnsapi
191 182
192 183
193 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in 184 diff -ur a/gio-2.0.pc.in b/gio-2.0.pc.in
194 index 9f7123f..b0d5779 100644 185 --- a/gio-2.0.pc.in 2013-01-20 20:48:44.000000000 +0100
195 --- a/gio-2.0.pc.in 186 +++ b/gio-2.0.pc.in 2013-06-29 05:25:16.328684390 +0200
196 +++ b/gio-2.0.pc.in 187 @@ -13,6 +13,6 @@
197 @@ -13,6 +13,6 @@ Description: glib I/O library
198 Version: @VERSION@ 188 Version: @VERSION@
199 Requires: glib-2.0 gobject-2.0 189 Requires: glib-2.0 gobject-2.0
200 Requires.private: gmodule-no-export-2.0 190 Requires.private: gmodule-no-export-2.0
201 -Libs: -L${libdir} -lgio-2.0 191 -Libs: -L${libdir} -lgio-2.0
202 +Libs: -L${libdir} -lgio-2.0 -ldnsapi 192 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
203 Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ 193 Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@
204 Cflags: 194 Cflags:
205 -- 195
206 1.7.10.4 196
207 197
208 198 From e0338b4fdd95e8273c84ba1daeea660c589d152a Mon Sep 17 00:00:00 2001
209 From c1f83b6ae587c99fefd482d0b1bfbe1d962320d4 Mon Sep 17 00:00:00 2001 199 From: MXE
210 From: Hans Petter Jansson <hpj@cl.no>
211 Date: Fri, 15 Jun 2012 15:29:38 +0200 200 Date: Fri, 15 Jun 2012 15:29:38 +0200
212 Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not 201 Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not
213 being run 202 being run
214 203
215 204
216 diff --git a/glib/gmain.c b/glib/gmain.c 205 diff -ur a/glib/gmain.c b/glib/gmain.c
217 index c0c4581..bef8b99 100644 206 --- a/glib/gmain.c 2013-06-10 00:03:18.000000000 +0200
218 --- a/glib/gmain.c 207 +++ b/glib/gmain.c 2013-06-29 05:33:10.568704963 +0200
219 +++ b/glib/gmain.c 208 @@ -2490,12 +2490,15 @@
220 @@ -2157,12 +2157,15 @@ g_get_real_time (void)
221 #ifdef G_OS_WIN32 209 #ifdef G_OS_WIN32
222 static ULONGLONG (*g_GetTickCount64) (void) = NULL; 210 static ULONGLONG (*g_GetTickCount64) (void) = NULL;
223 static guint32 g_win32_tick_epoch = 0; 211 static guint32 g_win32_tick_epoch = 0;
224 +static gboolean g_win32_clock_is_initialized; 212 +static gboolean g_win32_clock_is_initialized;
225 213
226 G_GNUC_INTERNAL void 214 void
227 g_clock_win32_init (void) 215 g_clock_win32_init (void)
228 { 216 {
229 HMODULE kernel32; 217 HMODULE kernel32;
230 218
231 + g_win32_clock_is_initialized = TRUE; 219 + g_win32_clock_is_initialized = TRUE;
232 + 220 +
233 g_GetTickCount64 = NULL; 221 g_GetTickCount64 = NULL;
234 kernel32 = GetModuleHandle ("KERNEL32.DLL"); 222 kernel32 = GetModuleHandle ("KERNEL32.DLL");
235 if (kernel32 != NULL) 223 if (kernel32 != NULL)
236 @@ -2281,6 +2284,9 @@ g_get_monotonic_time (void) 224 @@ -2614,6 +2617,9 @@
237 * timeBeginPeriod() to increase it as much as they want 225 * timeBeginPeriod() to increase it as much as they want
238 */ 226 */
239 227
240 + if (!g_win32_clock_is_initialized) 228 + if (!g_win32_clock_is_initialized)
241 + g_clock_win32_init (); 229 + g_clock_win32_init ();
242 + 230 +
243 if (g_GetTickCount64 != NULL) 231 if (g_GetTickCount64 != NULL)
244 { 232 {
245 guint32 ticks_as_32bit; 233 guint32 ticks_as_32bit;
246 diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c 234 diff -ur a/glib/gthread-win32.c b/glib/gthread-win32.c
247 index 5a9ac97..e4d1d48 100644 235 --- a/glib/gthread-win32.c 2013-06-03 01:20:49.000000000 +0200
248 --- a/glib/gthread-win32.c 236 +++ b/glib/gthread-win32.c 2013-06-29 05:49:13.580746730 +0200
249 +++ b/glib/gthread-win32.c 237 @@ -118,18 +118,28 @@
250 @@ -117,18 +117,28 @@ typedef struct
251 void (__stdcall * WakeConditionVariable) (gpointer cond); 238 void (__stdcall * WakeConditionVariable) (gpointer cond);
252 } GThreadImplVtable; 239 } GThreadImplVtable;
253 240
254 +/* Needed for static builds where DllMain initializer doesn't get called */ 241 +/* Needed for static builds where DllMain initializer doesn't get called */
255 +static gboolean g_threads_is_initialized; 242 +static gboolean g_threads_is_initialized;
274 + g_thread_win32_init (); 261 + g_thread_win32_init ();
275 + 262 +
276 if (g_thread_impl_vtable.DeleteSRWLock != NULL) 263 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
277 g_thread_impl_vtable.DeleteSRWLock (mutex); 264 g_thread_impl_vtable.DeleteSRWLock (mutex);
278 } 265 }
279 @@ -136,18 +146,27 @@ g_mutex_clear (GMutex *mutex) 266 @@ -137,18 +147,27 @@
280 void 267 void
281 g_mutex_lock (GMutex *mutex) 268 g_mutex_lock (GMutex *mutex)
282 { 269 {
283 + if (!g_threads_is_initialized) 270 + if (!g_threads_is_initialized)
284 + g_thread_win32_init (); 271 + g_thread_win32_init ();
302 + g_thread_win32_init (); 289 + g_thread_win32_init ();
303 + 290 +
304 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex); 291 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex);
305 } 292 }
306 293
307 @@ -158,6 +177,9 @@ g_rec_mutex_impl_new (void) 294 @@ -159,6 +178,9 @@
308 { 295 {
309 CRITICAL_SECTION *cs; 296 CRITICAL_SECTION *cs;
310 297
311 + if (!g_threads_is_initialized) 298 + if (!g_threads_is_initialized)
312 + g_thread_win32_init (); 299 + g_thread_win32_init ();
313 + 300 +
314 cs = g_slice_new (CRITICAL_SECTION); 301 cs = g_slice_new (CRITICAL_SECTION);
315 InitializeCriticalSection (cs); 302 InitializeCriticalSection (cs);
316 303
317 @@ -168,6 +190,10 @@ static void 304 @@ -169,6 +191,10 @@
318 g_rec_mutex_impl_free (CRITICAL_SECTION *cs) 305 g_rec_mutex_impl_free (CRITICAL_SECTION *cs)
319 { 306 {
320 DeleteCriticalSection (cs); 307 DeleteCriticalSection (cs);
321 + 308 +
322 + if (!g_threads_is_initialized) 309 + if (!g_threads_is_initialized)
323 + g_thread_win32_init (); 310 + g_thread_win32_init ();
324 + 311 +
325 g_slice_free (CRITICAL_SECTION, cs); 312 g_slice_free (CRITICAL_SECTION, cs);
326 } 313 }
327 314
328 @@ -176,6 +202,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex) 315 @@ -177,6 +203,9 @@
329 { 316 {
330 CRITICAL_SECTION *impl = mutex->p; 317 CRITICAL_SECTION *impl = mutex->p;
331 318
332 + if (!g_threads_is_initialized) 319 + if (!g_threads_is_initialized)
333 + g_thread_win32_init (); 320 + g_thread_win32_init ();
334 + 321 +
335 if G_UNLIKELY (mutex->p == NULL) 322 if G_UNLIKELY (mutex->p == NULL)
336 { 323 {
337 impl = g_rec_mutex_impl_new (); 324 impl = g_rec_mutex_impl_new ();
338 @@ -190,30 +219,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex) 325 @@ -191,30 +220,45 @@
339 void 326 void
340 g_rec_mutex_init (GRecMutex *mutex) 327 g_rec_mutex_init (GRecMutex *mutex)
341 { 328 {
342 + if (!g_threads_is_initialized) 329 + if (!g_threads_is_initialized)
343 + g_thread_win32_init (); 330 + g_thread_win32_init ();
379 + g_thread_win32_init (); 366 + g_thread_win32_init ();
380 + 367 +
381 return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex)); 368 return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex));
382 } 369 }
383 370
384 @@ -222,12 +266,18 @@ g_rec_mutex_trylock (GRecMutex *mutex) 371 @@ -223,12 +267,18 @@
385 void 372 void
386 g_rw_lock_init (GRWLock *lock) 373 g_rw_lock_init (GRWLock *lock)
387 { 374 {
388 + if (!g_threads_is_initialized) 375 + if (!g_threads_is_initialized)
389 + g_thread_win32_init (); 376 + g_thread_win32_init ();
398 + g_thread_win32_init (); 385 + g_thread_win32_init ();
399 + 386 +
400 if (g_thread_impl_vtable.DeleteSRWLock != NULL) 387 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
401 g_thread_impl_vtable.DeleteSRWLock (lock); 388 g_thread_impl_vtable.DeleteSRWLock (lock);
402 } 389 }
403 @@ -235,36 +285,54 @@ g_rw_lock_clear (GRWLock *lock) 390 @@ -236,36 +286,54 @@
404 void 391 void
405 g_rw_lock_writer_lock (GRWLock *lock) 392 g_rw_lock_writer_lock (GRWLock *lock)
406 { 393 {
407 + if (!g_threads_is_initialized) 394 + if (!g_threads_is_initialized)
408 + g_thread_win32_init (); 395 + g_thread_win32_init ();
453 + g_thread_win32_init (); 440 + g_thread_win32_init ();
454 + 441 +
455 g_thread_impl_vtable.ReleaseSRWLockShared (lock); 442 g_thread_impl_vtable.ReleaseSRWLockShared (lock);
456 } 443 }
457 444
458 @@ -272,12 +340,18 @@ g_rw_lock_reader_unlock (GRWLock *lock) 445 @@ -273,12 +341,18 @@
459 void 446 void
460 g_cond_init (GCond *cond) 447 g_cond_init (GCond *cond)
461 { 448 {
462 + if (!g_threads_is_initialized) 449 + if (!g_threads_is_initialized)
463 + g_thread_win32_init (); 450 + g_thread_win32_init ();
472 + g_thread_win32_init (); 459 + g_thread_win32_init ();
473 + 460 +
474 if (g_thread_impl_vtable.DeleteConditionVariable) 461 if (g_thread_impl_vtable.DeleteConditionVariable)
475 g_thread_impl_vtable.DeleteConditionVariable (cond); 462 g_thread_impl_vtable.DeleteConditionVariable (cond);
476 } 463 }
477 @@ -285,12 +359,18 @@ g_cond_clear (GCond *cond) 464 @@ -286,12 +360,18 @@
478 void 465 void
479 g_cond_signal (GCond *cond) 466 g_cond_signal (GCond *cond)
480 { 467 {
481 + if (!g_threads_is_initialized) 468 + if (!g_threads_is_initialized)
482 + g_thread_win32_init (); 469 + g_thread_win32_init ();
491 + g_thread_win32_init (); 478 + g_thread_win32_init ();
492 + 479 +
493 g_thread_impl_vtable.WakeAllConditionVariable (cond); 480 g_thread_impl_vtable.WakeAllConditionVariable (cond);
494 } 481 }
495 482
496 @@ -298,6 +378,9 @@ void 483 @@ -299,6 +379,9 @@
497 g_cond_wait (GCond *cond, 484 g_cond_wait (GCond *cond,
498 GMutex *entered_mutex) 485 GMutex *entered_mutex)
499 { 486 {
500 + if (!g_threads_is_initialized) 487 + if (!g_threads_is_initialized)
501 + g_thread_win32_init (); 488 + g_thread_win32_init ();
502 + 489 +
503 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0); 490 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0);
504 } 491 }
505 492
506 @@ -308,6 +391,9 @@ g_cond_wait_until (GCond *cond, 493 @@ -309,6 +392,9 @@
507 { 494 {
508 gint64 span; 495 gint64 span;
509 496
510 + if (!g_threads_is_initialized) 497 + if (!g_threads_is_initialized)
511 + g_thread_win32_init (); 498 + g_thread_win32_init ();
512 + 499 +
513 span = end_time - g_get_monotonic_time (); 500 span = end_time - g_get_monotonic_time ();
514 501
515 if G_UNLIKELY (span < 0) 502 if G_UNLIKELY (span < 0)
516 @@ -340,6 +426,9 @@ g_private_get_impl (GPrivate *key) 503 @@ -341,6 +427,9 @@
517 504
518 if G_UNLIKELY (impl == 0) 505 if G_UNLIKELY (impl == 0)
519 { 506 {
520 + if (!g_threads_is_initialized) 507 + if (!g_threads_is_initialized)
521 + g_thread_win32_init (); 508 + g_thread_win32_init ();
522 + 509 +
523 EnterCriticalSection (&g_private_lock); 510 EnterCriticalSection (&g_private_lock);
524 impl = (DWORD) key->p; 511 impl = (DWORD) key->p;
525 if (impl == 0) 512 if (impl == 0)
526 @@ -433,6 +522,9 @@ g_system_thread_free (GRealThread *thread) 513 @@ -434,6 +523,9 @@
527 { 514 {
528 GThreadWin32 *wt = (GThreadWin32 *) thread; 515 GThreadWin32 *wt = (GThreadWin32 *) thread;
529 516
530 + if (!g_threads_is_initialized) 517 + if (!g_threads_is_initialized)
531 + g_thread_win32_init (); 518 + g_thread_win32_init ();
532 + 519 +
533 win32_check_for_error (CloseHandle (wt->handle)); 520 win32_check_for_error (CloseHandle (wt->handle));
534 g_slice_free (GThreadWin32, wt); 521 g_slice_free (GThreadWin32, wt);
535 } 522 }
536 @@ -440,6 +532,9 @@ g_system_thread_free (GRealThread *thread) 523 @@ -441,6 +533,9 @@
537 void 524 void
538 g_system_thread_exit (void) 525 g_system_thread_exit (void)
539 { 526 {
540 + if (!g_threads_is_initialized) 527 + if (!g_threads_is_initialized)
541 + g_thread_win32_init (); 528 + g_thread_win32_init ();
542 + 529 +
543 _endthreadex (0); 530 _endthreadex (0);
544 } 531 }
545 532
546 @@ -448,6 +543,9 @@ g_thread_win32_proxy (gpointer data) 533 @@ -449,6 +544,9 @@
547 { 534 {
548 GThreadWin32 *self = data; 535 GThreadWin32 *self = data;
549 536
550 + if (!g_threads_is_initialized) 537 + if (!g_threads_is_initialized)
551 + g_thread_win32_init (); 538 + g_thread_win32_init ();
552 + 539 +
553 self->proxy (self); 540 self->proxy (self);
554 541
555 g_system_thread_exit (); 542 g_system_thread_exit ();
556 @@ -465,6 +563,9 @@ g_system_thread_new (GThreadFunc func, 543 @@ -466,6 +564,9 @@
557 GThreadWin32 *thread; 544 GThreadWin32 *thread;
558 guint ignore; 545 guint ignore;
559 546
560 + if (!g_threads_is_initialized) 547 + if (!g_threads_is_initialized)
561 + g_thread_win32_init (); 548 + g_thread_win32_init ();
562 + 549 +
563 thread = g_slice_new0 (GThreadWin32); 550 thread = g_slice_new0 (GThreadWin32);
564 thread->proxy = func; 551 thread->proxy = func;
565 552
566 @@ -494,6 +595,9 @@ g_system_thread_wait (GRealThread *thread) 553 @@ -495,6 +596,9 @@
567 { 554 {
568 GThreadWin32 *wt = (GThreadWin32 *) thread; 555 GThreadWin32 *wt = (GThreadWin32 *) thread;
569 556
570 + if (!g_threads_is_initialized) 557 + if (!g_threads_is_initialized)
571 + g_thread_win32_init (); 558 + g_thread_win32_init ();
572 + 559 +
573 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE)); 560 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE));
574 } 561 }
575 562
576 @@ -985,6 +1089,8 @@ g_thread_lookup_native_funcs (void) 563 @@ -986,6 +1090,8 @@
577 G_GNUC_INTERNAL void 564 void
578 g_thread_win32_init (void) 565 g_thread_win32_init (void)
579 { 566 {
580 + g_threads_is_initialized = TRUE; 567 + g_threads_is_initialized = TRUE;
581 + 568 +
582 if (!g_thread_lookup_native_funcs ()) 569 if (!g_thread_lookup_native_funcs ())
583 g_thread_xp_init (); 570 g_thread_xp_init ();
584 571
585 -- 572
586 1.7.10.4 573
587 574 From ce0f7354ac995f3b21cccabec880413d37f02fb6 Mon Sep 17 00:00:00 2001
588 575 From: MXE
589 From f7b3f3f390131d41855da11622eb18870aec0731 Mon Sep 17 00:00:00 2001
590 From: Mark Brand <mabrand@mabrand.nl>
591 Date: Mon, 18 Jun 2012 16:02:12 +0200 576 Date: Mon, 18 Jun 2012 16:02:12 +0200
592 Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific) 577 Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific)
593 578
594 579
595 diff --git a/Makefile.am b/Makefile.am 580 diff -urN a/autogen.sh b/autogen.sh
596 index 55be9d2..f000f10 100644 581 --- a/autogen.sh 2012-08-18 19:32:04.000000000 +0200
597 --- a/Makefile.am 582 +++ b/autogen.sh 2013-06-29 05:50:43.972750651 +0200
598 +++ b/Makefile.am 583 @@ -7,18 +7,6 @@
599 @@ -6,7 +6,7 @@ include $(top_srcdir)/Makefile.decl
600
601 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
602
603 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
604 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
605 DIST_SUBDIRS = $(SUBDIRS) build
606 if BUILD_MODULAR_TESTS
607 SUBDIRS += tests
608 @@ -67,8 +67,7 @@ BUILT_EXTRA_DIST = \
609 README \
610 INSTALL \
611 ChangeLog \
612 - config.h.win32 \
613 - gtk-doc.make
614 + config.h.win32
615
616 CONFIGURE_DEPENDENCIES = acglib.m4
617
618 diff --git a/autogen.sh b/autogen.sh
619 index 4bbc00d..bc0ab0b 100755
620 --- a/autogen.sh
621 +++ b/autogen.sh
622 @@ -7,18 +7,6 @@ test -n "$srcdir" || srcdir=.
623 olddir=`pwd` 584 olddir=`pwd`
624 cd "$srcdir" 585 cd "$srcdir"
625 586
626 -GTKDOCIZE=$(which gtkdocize 2>/dev/null) 587 -GTKDOCIZE=$(which gtkdocize 2>/dev/null)
627 -if test -z $GTKDOCIZE; then 588 -if test -z $GTKDOCIZE; then
636 -fi 597 -fi
637 - 598 -
638 AUTORECONF=`which autoreconf` 599 AUTORECONF=`which autoreconf`
639 if test -z $AUTORECONF; then 600 if test -z $AUTORECONF; then
640 echo "*** No autoreconf found, please install it ***" 601 echo "*** No autoreconf found, please install it ***"
641 diff --git a/configure.ac b/configure.ac 602 diff -urN a/configure.ac b/configure.ac
642 index 8754c21..4936f3c 100644 603 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
643 --- a/configure.ac 604 +++ b/configure.ac 2013-06-29 05:52:05.224754174 +0200
644 +++ b/configure.ac 605 @@ -2645,13 +2645,6 @@
645 @@ -2605,13 +2605,6 @@ AS_IF([ test $cross_compiling = yes && test x$enable_modular_tests = xyes], [
646 dnl ************************** 606 dnl **************************
647 dnl *** Checks for gtk-doc *** 607 dnl *** Checks for gtk-doc ***
648 dnl ************************** 608 dnl **************************
649 -# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have 609 -# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
650 -# it on it's own line. 610 -# it on it's own line.
654 -AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) 614 -AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
655 -]) 615 -])
656 616
657 AC_ARG_ENABLE(man, 617 AC_ARG_ENABLE(man,
658 [AS_HELP_STRING([--enable-man], 618 [AS_HELP_STRING([--enable-man],
659 diff --git a/docs/Makefile.am b/docs/Makefile.am 619 diff -urN a/docs/Makefile.am b/docs/Makefile.am
660 deleted file mode 100644 620 --- a/docs/Makefile.am 2013-06-10 00:03:17.000000000 +0200
661 index 2349f44..0000000 621 +++ b/docs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
662 --- a/docs/Makefile.am
663 +++ /dev/null
664 @@ -1,11 +0,0 @@ 622 @@ -1,11 +0,0 @@
665 -## Process this file with automake to produce Makefile.in 623 -## Process this file with automake to produce Makefile.in
666 -include $(top_srcdir)/Makefile.decl 624 -include $(top_srcdir)/Makefile.decl
667 - 625 -
668 -SUBDIRS = reference 626 -SUBDIRS = reference
671 - 629 -
672 -files: 630 -files:
673 - @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ 631 - @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
674 - echo $$p; \ 632 - echo $$p; \
675 - done 633 - done
676 diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am 634 diff -urN a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
677 deleted file mode 100644 635 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am 2013-06-10 00:03:17.000000000 +0200
678 index 63cf90d..0000000 636 +++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am 1970-01-01 01:00:00.000000000 +0100
679 --- a/docs/reference/Makefile.am 637 @@ -1,68 +0,0 @@
680 +++ /dev/null
681 @@ -1,3 +0,0 @@
682 -include $(top_srcdir)/Makefile.decl 638 -include $(top_srcdir)/Makefile.decl
683 - 639 -NULL =
684 -SUBDIRS = glib gobject gio 640 -
685 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am 641 -# The name of the module.
686 deleted file mode 100644 642 -DOC_MODULE=gdbus-object-manager-example
687 index 64d95fe..0000000 643 -
688 --- a/docs/reference/gio/Makefile.am 644 -# The top-level SGML file.
689 +++ /dev/null 645 -DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml
646 -
647 -# Extra options to supply to gtkdoc-scan
648 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
649 -
650 -# The directory containing the source code. Relative to $(srcdir)
651 -DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example
652 -
653 -HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
654 -CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
655 -
656 -# Headers to ignore
657 -IGNORE_HFILES = \
658 - $(NULL)
659 -
660 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
661 -# if $(DOC_MODULE).types is non-empty.
662 -AM_CPPFLAGS = \
663 - $(gio_INCLUDES) \
664 - $(GLIB_DEBUG_FLAGS)
665 -
666 -GTKDOC_LIBS = \
667 - $(top_builddir)/glib/libglib-2.0.la \
668 - $(top_builddir)/gobject/libgobject-2.0.la \
669 - $(top_builddir)/gmodule/libgmodule-2.0.la \
670 - $(top_builddir)/gio/libgio-2.0.la \
671 - $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \
672 - $(NULL)
673 -
674 -# Extra options to supply to gtkdoc-mkdb
675 -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
676 - $(NULL)
677 -
678 -# Images to copy into HTML directory
679 -HTML_IMAGES = \
680 - $(NULL)
681 -
682 -content_files = \
683 - $(NULL)
684 -
685 -expand_content_files = \
686 - $(NULL)
687 -
688 -extra_files = \
689 - $(NULL)
690 -
691 -include $(top_srcdir)/gtk-doc.make
692 -
693 -EXTRA_DIST += \
694 - $(NULL)
695 -
696 -MAINTAINERCLEANFILES = $(BUILT_SOURCES)
697 -
698 -dist-hook-local: all-local
699 -
700 -gdbus-object-manager-example-docs-clean: clean
701 - cd $(srcdir) && rm -rf xml html
702 -
703 -# Nuke installed docs (don't know how to avoid installing them)
704 -install-data-hook :
705 - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
706 diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
707 --- a/docs/reference/gio/Makefile.am 2013-06-10 00:03:17.000000000 +0200
708 +++ b/docs/reference/gio/Makefile.am 1970-01-01 01:00:00.000000000 +0100
690 @@ -1,179 +0,0 @@ 709 @@ -1,179 +0,0 @@
691 -include $(top_srcdir)/Makefile.decl 710 -include $(top_srcdir)/Makefile.decl
692 -NULL = 711 -NULL =
693 - 712 -
694 -SUBDIRS = gdbus-object-manager-example 713 -SUBDIRS = gdbus-object-manager-example
772 - gwin32volumemonitor.h 791 - gwin32volumemonitor.h
773 - 792 -
774 - 793 -
775 -# CFLAGS and LDFLAGS for compiling scan program. Only needed 794 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
776 -# if $(DOC_MODULE).types is non-empty. 795 -# if $(DOC_MODULE).types is non-empty.
777 -INCLUDES = \ 796 -AM_CPPFLAGS = \
778 - $(gio_INCLUDES) \ 797 - $(gio_INCLUDES) \
779 - $(GLIB_DEBUG_FLAGS) 798 - $(GLIB_DEBUG_FLAGS)
780 - 799 -
781 -GTKDOC_LIBS = \ 800 -GTKDOC_LIBS = \
782 - $(top_builddir)/glib/libglib-2.0.la \ 801 - $(top_builddir)/glib/libglib-2.0.la \
865 - 884 -
866 -dist-hook-local: all-local 885 -dist-hook-local: all-local
867 - 886 -
868 -gio-docs-clean: clean 887 -gio-docs-clean: clean
869 - cd $(srcdir) && rm -rf xml html 888 - cd $(srcdir) && rm -rf xml html
870 diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am 889 diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
871 deleted file mode 100644 890 --- a/docs/reference/glib/Makefile.am 2013-06-10 00:03:17.000000000 +0200
872 index 90c10aa..0000000 891 +++ b/docs/reference/glib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
873 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
874 +++ /dev/null
875 @@ -1,68 +0,0 @@
876 -include $(top_srcdir)/Makefile.decl
877 -NULL =
878 -
879 -# The name of the module.
880 -DOC_MODULE=gdbus-object-manager-example
881 -
882 -# The top-level SGML file.
883 -DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml
884 -
885 -# Extra options to supply to gtkdoc-scan
886 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
887 -
888 -# The directory containing the source code. Relative to $(srcdir)
889 -DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example
890 -
891 -HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
892 -CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
893 -
894 -# Headers to ignore
895 -IGNORE_HFILES= \
896 - $(NULL)
897 -
898 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
899 -# if $(DOC_MODULE).types is non-empty.
900 -INCLUDES = \
901 - $(gio_INCLUDES) \
902 - $(GLIB_DEBUG_FLAGS)
903 -
904 -GTKDOC_LIBS = \
905 - $(top_builddir)/glib/libglib-2.0.la \
906 - $(top_builddir)/gobject/libgobject-2.0.la \
907 - $(top_builddir)/gmodule/libgmodule-2.0.la \
908 - $(top_builddir)/gio/libgio-2.0.la \
909 - $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \
910 - $(NULL)
911 -
912 -# Extra options to supply to gtkdoc-mkdb
913 -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
914 - $(NULL)
915 -
916 -# Images to copy into HTML directory
917 -HTML_IMAGES = \
918 - $(NULL)
919 -
920 -content_files = \
921 - $(NULL)
922 -
923 -expand_content_files = \
924 - $(NULL)
925 -
926 -extra_files = \
927 - $(NULL)
928 -
929 -include $(top_srcdir)/gtk-doc.make
930 -
931 -EXTRA_DIST += \
932 - $(NULL)
933 -
934 -MAINTAINERCLEANFILES = $(BUILT_SOURCES)
935 -
936 -dist-hook-local: all-local
937 -
938 -gdbus-object-manager-example-docs-clean: clean
939 - cd $(srcdir) && rm -rf xml html
940 -
941 -# Nuke installed docs (don't know how to avoid installing them)
942 -install-data-hook :
943 - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
944 diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
945 deleted file mode 100644
946 index 54918c8..0000000
947 --- a/docs/reference/glib/Makefile.am
948 +++ /dev/null
949 @@ -1,128 +0,0 @@ 892 @@ -1,128 +0,0 @@
950 -## Process this file with automake to produce Makefile.in 893 -## Process this file with automake to produce Makefile.in
951 -include $(top_srcdir)/Makefile.decl 894 -include $(top_srcdir)/Makefile.decl
952 - 895 -
953 -AUTOMAKE_OPTIONS = 1.6 896 -AUTOMAKE_OPTIONS = 1.6
1073 - 1016 -
1074 -dist-hook-local: all-local 1017 -dist-hook-local: all-local
1075 - 1018 -
1076 -glib-docs-clean: clean 1019 -glib-docs-clean: clean
1077 - cd $(srcdir) && rm -rf xml html 1020 - cd $(srcdir) && rm -rf xml html
1078 diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am 1021 diff -urN a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
1079 deleted file mode 100644 1022 --- a/docs/reference/gobject/Makefile.am 2013-06-10 00:03:17.000000000 +0200
1080 index 48d88f8..0000000 1023 +++ b/docs/reference/gobject/Makefile.am 1970-01-01 01:00:00.000000000 +0100
1081 --- a/docs/reference/gobject/Makefile.am 1024 @@ -1,104 +0,0 @@
1082 +++ /dev/null
1083 @@ -1,103 +0,0 @@
1084 -## Process this file with automake to produce Makefile.in 1025 -## Process this file with automake to produce Makefile.in
1085 -include $(top_srcdir)/Makefile.decl 1026 -include $(top_srcdir)/Makefile.decl
1086 - 1027 -
1087 -AUTOMAKE_OPTIONS = 1.6 1028 -AUTOMAKE_OPTIONS = 1.6
1088 - 1029 -
1114 - gatomicarray.h 1055 - gatomicarray.h
1115 - 1056 -
1116 - 1057 -
1117 -# CFLAGS and LDFLAGS for compiling scan program. Only needed 1058 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
1118 -# if $(DOC_MODULE).types is non-empty. 1059 -# if $(DOC_MODULE).types is non-empty.
1119 -INCLUDES = \ 1060 -AM_CPPFLAGS = \
1120 - -I$(srcdir) \ 1061 - -I$(srcdir) \
1121 - $(gobject_INCLUDES) \ 1062 - $(gobject_INCLUDES) \
1122 - $(GLIB_DEBUG_FLAGS) 1063 - $(GLIB_DEBUG_FLAGS)
1123 -GTKDOC_LIBS = \ 1064 -
1065 -GTKDOC_LIBS = \
1124 - $(top_builddir)/glib/libglib-2.0.la \ 1066 - $(top_builddir)/glib/libglib-2.0.la \
1125 - $(top_builddir)/gobject/libgobject-2.0.la 1067 - $(top_builddir)/gobject/libgobject-2.0.la
1126 - 1068 -
1127 -# Images to copy into HTML directory 1069 -# Images to copy into HTML directory
1128 -HTML_IMAGES = \ 1070 -HTML_IMAGES = \
1182 - 1124 -
1183 -dist-hook-local: all-local 1125 -dist-hook-local: all-local
1184 - 1126 -
1185 -gobject-docs-clean: clean 1127 -gobject-docs-clean: clean
1186 - cd $(srcdir) && rm -rf xml html 1128 - cd $(srcdir) && rm -rf xml html
1187 -- 1129 diff -urN a/docs/reference/Makefile.am b/docs/reference/Makefile.am
1188 1.7.10.4 1130 --- a/docs/reference/Makefile.am 2013-06-10 00:03:17.000000000 +0200
1189 1131 +++ b/docs/reference/Makefile.am 1970-01-01 01:00:00.000000000 +0100
1132 @@ -1,3 +0,0 @@
1133 -include $(top_srcdir)/Makefile.decl
1134 -
1135 -SUBDIRS = glib gobject gio
1136 diff -urN a/Makefile.am b/Makefile.am
1137 --- a/Makefile.am 2013-06-10 00:03:17.000000000 +0200
1138 +++ b/Makefile.am 2013-06-29 05:50:18.224749533 +0200
1139 @@ -6,7 +6,7 @@
1140
1141 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
1142
1143 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
1144 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
1145 DIST_SUBDIRS = $(SUBDIRS) build
1146 if BUILD_MODULAR_TESTS
1147 SUBDIRS += tests
1148 @@ -71,8 +71,7 @@
1149 README \
1150 INSTALL \
1151 ChangeLog \
1152 - config.h.win32 \
1153 - gtk-doc.make
1154 + config.h.win32
1155
1156 CONFIGURE_DEPENDENCIES = acglib.m4
1157