Mercurial > mxe-octave

comparison src/mingw-glib-1-fixes.patch @ 3132:2733829a184e

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