Mercurial > mxe-octave

comparison src/glib-1-fixes.patch @ 2817:8b3bb715b237

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package glib
author Mark Brand <mabrand@mabrand.nl>
date Fri, 12 Oct 2012 12:14:00 +0200
parents 383ab5d1e69f
children
comparison
equal deleted inserted replaced
2816:5f8b6875b672 2817:8b3bb715b237
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 2a15b5d8c570d34e44d315116219bcd731054a54 Mon Sep 17 00:00:00 2001 6 From eacb3702acc44de8e5a3c9a324cb9a81333e3737 Mon Sep 17 00:00:00 2001
7 From: "a@mxe.cc" <a@mxe.cc> 7 From: "a@mxe.cc" <a@mxe.cc>
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 ---
12 configure.ac | 4 ++--
13 glib/gi18n.h | 5 +++++
14 2 files changed, 7 insertions(+), 2 deletions(-)
15 11
16 diff --git a/configure.ac b/configure.ac 12 diff --git a/configure.ac b/configure.ac
17 index cadd925..241284d 100644 13 index 054485f..9321fbc 100644
18 --- a/configure.ac 14 --- a/configure.ac
19 +++ b/configure.ac 15 +++ b/configure.ac
20 @@ -479,8 +479,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) 16 @@ -482,8 +482,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
21 GLIB_GNU_GETTEXT 17 GLIB_GNU_GETTEXT
22 18
23 if test "$gt_cv_have_gettext" != "yes" ; then 19 if test "$gt_cv_have_gettext" != "yes" ; then
24 - AC_MSG_ERROR([ 20 - AC_MSG_ERROR([
25 -*** You must have either have gettext support in your C library, or use the 21 -*** You must have either have gettext support in your C library, or use the
47 #define _(String) gettext (String) 43 #define _(String) gettext (String)
48 -- 44 --
49 1.7.10.4 45 1.7.10.4
50 46
51 47
52 From 6e19d772238eb429fe0ea77b65dbc9d8a5d89afa Mon Sep 17 00:00:00 2001 48 From c88a15fbac3076f772894ebcd2003786b37603d4 Mon Sep 17 00:00:00 2001
53 From: "a@mxe.cc" <a@mxe.cc> 49 From: "a@mxe.cc" <a@mxe.cc>
54 Date: Thu, 23 Sep 2010 21:42:46 +0200 50 Date: Thu, 23 Sep 2010 21:42:46 +0200
55 Subject: [PATCH 2/8] fix tool paths 51 Subject: [PATCH 2/8] fix tool paths
56 52
57 ---
58 glib-2.0.pc.in | 6 +++---
59 1 file changed, 3 insertions(+), 3 deletions(-)
60 53
61 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in 54 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
62 index 4a8898e..5164bae 100644 55 index 4a8898e..5164bae 100644
63 --- a/glib-2.0.pc.in 56 --- a/glib-2.0.pc.in
64 +++ b/glib-2.0.pc.in 57 +++ b/glib-2.0.pc.in
77 Description: C Utility Library 70 Description: C Utility Library
78 -- 71 --
79 1.7.10.4 72 1.7.10.4
80 73
81 74
82 From 556504bac07f4d80c0d9e50be1090f3ae02a653b Mon Sep 17 00:00:00 2001 75 From fdf03eb9fff0532fa6dea660a5665242f6ccac9e Mon Sep 17 00:00:00 2001
83 From: Hans Petter Jansson <hpj@cl.no> 76 From: Hans Petter Jansson <hpj@cl.no>
84 Date: Fri, 15 Jun 2012 15:25:01 +0200 77 Date: Fri, 15 Jun 2012 15:25:01 +0200
85 Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically 78 Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically
86 79
87 ---
88 gio/giomodule.c | 6 +-----
89 glib/glib-init.c | 6 +++---
90 2 files changed, 4 insertions(+), 8 deletions(-)
91 80
92 diff --git a/gio/giomodule.c b/gio/giomodule.c 81 diff --git a/gio/giomodule.c b/gio/giomodule.c
93 index d8ce138..679279f 100644 82 index 37a9e70..2e5ef9b 100644
94 --- a/gio/giomodule.c 83 --- a/gio/giomodule.c
95 +++ b/gio/giomodule.c 84 +++ b/gio/giomodule.c
96 @@ -782,10 +782,8 @@ extern GType _g_network_monitor_netlink_get_type (void); 85 @@ -782,10 +782,8 @@ extern GType _g_network_monitor_netlink_get_type (void);
97 86
98 static HMODULE gio_dll = NULL; 87 static HMODULE gio_dll = NULL;
133 { 122 {
134 -- 123 --
135 1.7.10.4 124 1.7.10.4
136 125
137 126
138 From a83efeaa712bdfe43a1fcada6775ce2c89781631 Mon Sep 17 00:00:00 2001 127 From 64c337b9654441cc1b90ed3ac86f928073ec208e Mon Sep 17 00:00:00 2001
139 From: Hans Petter Jansson <hpj@cl.no> 128 From: Hans Petter Jansson <hpj@cl.no>
140 Date: Fri, 15 Jun 2012 15:27:22 +0200 129 Date: Fri, 15 Jun 2012 15:27:22 +0200
141 Subject: [PATCH 4/8] Allow building without inotify support 130 Subject: [PATCH 4/8] Allow building without inotify support
142 131
143 ---
144 configure.ac | 13 ++++++++++---
145 1 file changed, 10 insertions(+), 3 deletions(-)
146 132
147 diff --git a/configure.ac b/configure.ac 133 diff --git a/configure.ac b/configure.ac
148 index 241284d..04d8590 100644 134 index 9321fbc..5c6bb3e 100644
149 --- a/configure.ac 135 --- a/configure.ac
150 +++ b/configure.ac 136 +++ b/configure.ac
151 @@ -1700,11 +1700,18 @@ dnl ***************************** 137 @@ -1712,11 +1712,18 @@ dnl *****************************
152 dnl ** Check for inotify (GIO) ** 138 dnl ** Check for inotify (GIO) **
153 dnl ***************************** 139 dnl *****************************
154 inotify_support=no 140 inotify_support=no
155 -AC_CHECK_HEADERS([sys/inotify.h], 141 -AC_CHECK_HEADERS([sys/inotify.h],
156 -[ 142 -[
172 158
173 -- 159 --
174 1.7.10.4 160 1.7.10.4
175 161
176 162
177 From e3d193f7e4f3d1ada0d65ccdccab1f28ef6d23d3 Mon Sep 17 00:00:00 2001 163 From c80c435bd8d92857eeb54273024ca8782fa089c6 Mon Sep 17 00:00:00 2001
178 From: Hans Petter Jansson <hpj@cl.no> 164 From: Hans Petter Jansson <hpj@cl.no>
179 Date: Fri, 15 Jun 2012 15:28:14 +0200 165 Date: Fri, 15 Jun 2012 15:28:14 +0200
180 Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. 166 Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
181 Backported from upstream 167 Backported from upstream
182 168
183 ---
184 configure.ac | 2 ++
185 1 file changed, 2 insertions(+)
186 169
187 diff --git a/configure.ac b/configure.ac 170 diff --git a/configure.ac b/configure.ac
188 index 04d8590..29b6252 100644 171 index 5c6bb3e..8754c21 100644
189 --- a/configure.ac 172 --- a/configure.ac
190 +++ b/configure.ac 173 +++ b/configure.ac
191 @@ -452,6 +452,8 @@ fi 174 @@ -455,6 +455,8 @@ fi
192 175
193 AC_MSG_RESULT($enable_iconv_cache) 176 AC_MSG_RESULT($enable_iconv_cache)
194 177
195 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF 178 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF
196 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])]) 179 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])])
199 dnl zlib support 182 dnl zlib support
200 -- 183 --
201 1.7.10.4 184 1.7.10.4
202 185
203 186
204 From 08b493b8480f360ab21a0ce5c79b096392a389a8 Mon Sep 17 00:00:00 2001 187 From e7e2c1c881813a2a17bfec7b63c673eb979b3833 Mon Sep 17 00:00:00 2001
205 From: Hans Petter Jansson <hpj@cl.no> 188 From: Hans Petter Jansson <hpj@cl.no>
206 Date: Fri, 15 Jun 2012 15:29:06 +0200 189 Date: Fri, 15 Jun 2012 15:29:06 +0200
207 Subject: [PATCH 6/8] Link with dnsapi 190 Subject: [PATCH 6/8] Link with dnsapi
208 191
209 ---
210 gio-2.0.pc.in | 2 +-
211 1 file changed, 1 insertion(+), 1 deletion(-)
212 192
213 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in 193 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
214 index 9f7123f..b0d5779 100644 194 index 9f7123f..b0d5779 100644
215 --- a/gio-2.0.pc.in 195 --- a/gio-2.0.pc.in
216 +++ b/gio-2.0.pc.in 196 +++ b/gio-2.0.pc.in
224 Cflags: 204 Cflags:
225 -- 205 --
226 1.7.10.4 206 1.7.10.4
227 207
228 208
229 From 645849d2055b1c7a46132a8b83739290b316ffba Mon Sep 17 00:00:00 2001 209 From c1f83b6ae587c99fefd482d0b1bfbe1d962320d4 Mon Sep 17 00:00:00 2001
230 From: Hans Petter Jansson <hpj@cl.no> 210 From: Hans Petter Jansson <hpj@cl.no>
231 Date: Fri, 15 Jun 2012 15:29:38 +0200 211 Date: Fri, 15 Jun 2012 15:29:38 +0200
232 Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not 212 Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not
233 being run 213 being run
234 214
235 ---
236 glib/gmain.c | 6 +++
237 glib/gthread-win32.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++
238 2 files changed, 112 insertions(+)
239 215
240 diff --git a/glib/gmain.c b/glib/gmain.c 216 diff --git a/glib/gmain.c b/glib/gmain.c
241 index 760f179..878ac14 100644 217 index c0c4581..bef8b99 100644
242 --- a/glib/gmain.c 218 --- a/glib/gmain.c
243 +++ b/glib/gmain.c 219 +++ b/glib/gmain.c
244 @@ -1981,12 +1981,15 @@ g_get_real_time (void) 220 @@ -2157,12 +2157,15 @@ g_get_real_time (void)
245 #ifdef G_OS_WIN32 221 #ifdef G_OS_WIN32
246 static ULONGLONG (*g_GetTickCount64) (void) = NULL; 222 static ULONGLONG (*g_GetTickCount64) (void) = NULL;
247 static guint32 g_win32_tick_epoch = 0; 223 static guint32 g_win32_tick_epoch = 0;
248 +static gboolean g_win32_clock_is_initialized; 224 +static gboolean g_win32_clock_is_initialized;
249 225
255 + g_win32_clock_is_initialized = TRUE; 231 + g_win32_clock_is_initialized = TRUE;
256 + 232 +
257 g_GetTickCount64 = NULL; 233 g_GetTickCount64 = NULL;
258 kernel32 = GetModuleHandle ("KERNEL32.DLL"); 234 kernel32 = GetModuleHandle ("KERNEL32.DLL");
259 if (kernel32 != NULL) 235 if (kernel32 != NULL)
260 @@ -2105,6 +2108,9 @@ g_get_monotonic_time (void) 236 @@ -2281,6 +2284,9 @@ g_get_monotonic_time (void)
261 * timeBeginPeriod() to increase it as much as they want 237 * timeBeginPeriod() to increase it as much as they want
262 */ 238 */
263 239
264 + if (!g_win32_clock_is_initialized) 240 + if (!g_win32_clock_is_initialized)
265 + g_clock_win32_init (); 241 + g_clock_win32_init ();
608 584
609 -- 585 --
610 1.7.10.4 586 1.7.10.4
611 587
612 588
613 From e6c9e1075e9c176d0184cff07d6f2eef224ab608 Mon Sep 17 00:00:00 2001 589 From f7b3f3f390131d41855da11622eb18870aec0731 Mon Sep 17 00:00:00 2001
614 From: Mark Brand <mabrand@mabrand.nl> 590 From: Mark Brand <mabrand@mabrand.nl>
615 Date: Mon, 18 Jun 2012 16:02:12 +0200 591 Date: Mon, 18 Jun 2012 16:02:12 +0200
616 Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific) 592 Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific)
617 593
618 ---
619 Makefile.am | 5 +-
620 autogen.sh | 7 -
621 configure.ac | 2 -
622 docs/Makefile.am | 11 --
623 docs/reference/Makefile.am | 3 -
624 docs/reference/gio/Makefile.am | 181 --------------------
625 .../gio/gdbus-object-manager-example/Makefile.am | 68 --------
626 docs/reference/glib/Makefile.am | 129 --------------
627 docs/reference/gobject/Makefile.am | 103 -----------
628 9 files changed, 2 insertions(+), 507 deletions(-)
629 delete mode 100644 docs/Makefile.am
630 delete mode 100644 docs/reference/Makefile.am
631 delete mode 100644 docs/reference/gio/Makefile.am
632 delete mode 100644 docs/reference/gio/gdbus-object-manager-example/Makefile.am
633 delete mode 100644 docs/reference/glib/Makefile.am
634 delete mode 100644 docs/reference/gobject/Makefile.am
635 594
636 diff --git a/Makefile.am b/Makefile.am 595 diff --git a/Makefile.am b/Makefile.am
637 index f5c510d..28d77c6 100644 596 index 55be9d2..f000f10 100644
638 --- a/Makefile.am 597 --- a/Makefile.am
639 +++ b/Makefile.am 598 +++ b/Makefile.am
640 @@ -6,7 +6,7 @@ include $(top_srcdir)/Makefile.decl 599 @@ -6,7 +6,7 @@ include $(top_srcdir)/Makefile.decl
641 600
642 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} 601 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
643 602
644 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs 603 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
645 +SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po 604 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
646 DIST_SUBDIRS = $(SUBDIRS) build 605 DIST_SUBDIRS = $(SUBDIRS) build
647 606 if BUILD_MODULAR_TESTS
648 bin_SCRIPTS = glib-gettextize 607 SUBDIRS += tests
649 @@ -62,8 +62,7 @@ BUILT_EXTRA_DIST = \ 608 @@ -67,8 +67,7 @@ BUILT_EXTRA_DIST = \
650 README \ 609 README \
651 INSTALL \ 610 INSTALL \
652 ChangeLog \ 611 ChangeLog \
653 - config.h.win32 \ 612 - config.h.win32 \
654 - gtk-doc.make 613 - gtk-doc.make
655 + config.h.win32 614 + config.h.win32
656 615
657 CONFIGURE_DEPENDENCIES = acglib.m4 616 CONFIGURE_DEPENDENCIES = acglib.m4
658 617
659 diff --git a/autogen.sh b/autogen.sh 618 diff --git a/autogen.sh b/autogen.sh
660 index 01011d9..bc0ab0b 100755 619 index 4bbc00d..bc0ab0b 100755
661 --- a/autogen.sh 620 --- a/autogen.sh
662 +++ b/autogen.sh 621 +++ b/autogen.sh
663 @@ -7,12 +7,6 @@ test -n "$srcdir" || srcdir=. 622 @@ -7,18 +7,6 @@ test -n "$srcdir" || srcdir=.
664 olddir=`pwd` 623 olddir=`pwd`
665 cd "$srcdir" 624 cd "$srcdir"
666 625
667 -GTKDOCIZE=`which gtkdocize` 626 -GTKDOCIZE=$(which gtkdocize 2>/dev/null)
668 -if test -z $GTKDOCIZE; then 627 -if test -z $GTKDOCIZE; then
669 - echo "*** No GTK-Doc found, please install it ***" 628 - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
670 - exit 1 629 - rm -f gtk-doc.make
630 - cat > gtk-doc.make <<EOF
631 -EXTRA_DIST =
632 -CLEANFILES =
633 -EOF
634 -else
635 - gtkdocize || exit $?
671 -fi 636 -fi
672 - 637 -
673 AUTORECONF=`which autoreconf` 638 AUTORECONF=`which autoreconf`
674 if test -z $AUTORECONF; then 639 if test -z $AUTORECONF; then
675 echo "*** No autoreconf found, please install it ***" 640 echo "*** No autoreconf found, please install it ***"
676 @@ -24,7 +18,6 @@ fi
677 # regenerated from their corresponding *.in files by ./configure anyway.
678 touch README INSTALL
679
680 -gtkdocize || exit $?
681 autoreconf --force --install --verbose || exit $?
682
683 cd "$olddir"
684 diff --git a/configure.ac b/configure.ac 641 diff --git a/configure.ac b/configure.ac
685 index 29b6252..24a0c3c 100644 642 index 8754c21..4936f3c 100644
686 --- a/configure.ac 643 --- a/configure.ac
687 +++ b/configure.ac 644 +++ b/configure.ac
688 @@ -2598,8 +2598,6 @@ dnl ************************** 645 @@ -2605,13 +2605,6 @@ AS_IF([ test $cross_compiling = yes && test x$enable_modular_tests = xyes], [
646 dnl **************************
689 dnl *** Checks for gtk-doc *** 647 dnl *** Checks for gtk-doc ***
690 dnl ************************** 648 dnl **************************
691 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], [
692 -GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) 652 -GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
693 - 653 -],[
654 -AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
655 -])
656
694 AC_ARG_ENABLE(man, 657 AC_ARG_ENABLE(man,
695 [AC_HELP_STRING([--enable-man], 658 [AS_HELP_STRING([--enable-man],
696 [regenerate man pages from Docbook [default=no]])],enable_man=yes,
697 diff --git a/docs/Makefile.am b/docs/Makefile.am 659 diff --git a/docs/Makefile.am b/docs/Makefile.am
698 deleted file mode 100644 660 deleted file mode 100644
699 index 2349f44..0000000 661 index 2349f44..0000000
700 --- a/docs/Makefile.am 662 --- a/docs/Makefile.am
701 +++ /dev/null 663 +++ /dev/null
720 -include $(top_srcdir)/Makefile.decl 682 -include $(top_srcdir)/Makefile.decl
721 - 683 -
722 -SUBDIRS = glib gobject gio 684 -SUBDIRS = glib gobject gio
723 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am 685 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
724 deleted file mode 100644 686 deleted file mode 100644
725 index 7d2d264..0000000 687 index 64d95fe..0000000
726 --- a/docs/reference/gio/Makefile.am 688 --- a/docs/reference/gio/Makefile.am
727 +++ /dev/null 689 +++ /dev/null
728 @@ -1,181 +0,0 @@ 690 @@ -1,179 +0,0 @@
729 -include $(top_srcdir)/Makefile.decl 691 -include $(top_srcdir)/Makefile.decl
730 -NULL = 692 -NULL =
731 - 693 -
732 -SUBDIRS = gdbus-object-manager-example 694 -SUBDIRS = gdbus-object-manager-example
733 - 695 -
868 -include $(top_srcdir)/gtk-doc.make 830 -include $(top_srcdir)/gtk-doc.make
869 - 831 -
870 -EXTRA_DIST += \ 832 -EXTRA_DIST += \
871 - version.xml.in 833 - version.xml.in
872 - 834 -
873 -man_MANS = \ 835 -man_MANS =
836 -
837 -if ENABLE_MAN
838 -
839 -man_MANS += \
874 - gio-querymodules.1 \ 840 - gio-querymodules.1 \
875 - glib-compile-schemas.1 \ 841 - glib-compile-schemas.1 \
876 - glib-compile-resources.1 \ 842 - glib-compile-resources.1 \
877 - gsettings.1 \ 843 - gsettings.1 \
878 - gresource.1 \ 844 - gresource.1 \
879 - gdbus.1 \ 845 - gdbus.1 \
880 - gdbus-codegen.1 846 - gdbus-codegen.1
881 - 847 -
882 -if ENABLE_MAN 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
883 - 855 -
884 -.xml.1: 856 -.xml.1:
885 - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< 857 - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
886 -
887 -dist-local-check-mans-enabled:
888 - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
889 -
890 -else
891 -
892 -$(man_MANS):
893 - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
894 - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@
895 -
896 -dist-local-check-mans-enabled:
897 - echo "*** --enable-man must be used in order to make dist"
898 - false
899 - 858 -
900 -endif 859 -endif
901 - 860 -
902 -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) 861 -CLEANFILES ?=
862 -CLEANFILES += $(man_MANS)
903 - 863 -
904 -EXTRA_DIST += $(man_MANS) 864 -EXTRA_DIST += $(man_MANS)
905 - 865 -
906 -dist-hook-local: dist-local-check-mans-enabled all-local 866 -dist-hook-local: all-local
907 - 867 -
908 -gio-docs-clean: clean 868 -gio-docs-clean: clean
909 - cd $(srcdir) && rm -rf xml html 869 - cd $(srcdir) && rm -rf xml html
910 diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am 870 diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
911 deleted file mode 100644 871 deleted file mode 100644
981 -# Nuke installed docs (don't know how to avoid installing them) 941 -# Nuke installed docs (don't know how to avoid installing them)
982 -install-data-hook : 942 -install-data-hook :
983 - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example 943 - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
984 diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am 944 diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
985 deleted file mode 100644 945 deleted file mode 100644
986 index 2ceae09..0000000 946 index 54918c8..0000000
987 --- a/docs/reference/glib/Makefile.am 947 --- a/docs/reference/glib/Makefile.am
988 +++ /dev/null 948 +++ /dev/null
989 @@ -1,129 +0,0 @@ 949 @@ -1,128 +0,0 @@
990 -## Process this file with automake to produce Makefile.in 950 -## Process this file with automake to produce Makefile.in
991 -include $(top_srcdir)/Makefile.decl 951 -include $(top_srcdir)/Makefile.decl
992 - 952 -
993 -AUTOMAKE_OPTIONS = 1.6 953 -AUTOMAKE_OPTIONS = 1.6
994 - 954 -
995 -# The name of the module. 955 -# The name of the module.
996 -DOC_MODULE=glib 956 -DOC_MODULE=glib
997 - 957 -
998 -# The top-level SGML file. 958 -# The top-level SGML file.
999 -DOC_MAIN_SGML_FILE=glib-docs.sgml 959 -DOC_MAIN_SGML_FILE=glib-docs.xml
1000 - 960 -
1001 -# The directory containing the source code. Relative to $(srcdir) 961 -# The directory containing the source code. Relative to $(srcdir)
1002 -DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule 962 -DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule
1003 - 963 -
1004 -# Extra options to supply to gtkdoc-scan 964 -# Extra options to supply to gtkdoc-scan
1047 - file-name-encodings.png \ 1007 - file-name-encodings.png \
1048 - mainloop-states.gif 1008 - mainloop-states.gif
1049 - 1009 -
1050 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) 1010 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
1051 -content_files = \ 1011 -content_files = \
1052 - cross.sgml \ 1012 - cross.xml \
1053 - running.sgml \ 1013 - running.xml \
1054 - building.sgml \ 1014 - building.xml \
1055 - changes.sgml \ 1015 - changes.xml \
1056 - compiling.sgml \ 1016 - compiling.xml \
1057 - resources.sgml \ 1017 - programming.xml \
1058 - regex-syntax.sgml \ 1018 - resources.xml \
1019 - regex-syntax.xml \
1059 - version.xml \ 1020 - version.xml \
1060 - glib-gettextize.xml \ 1021 - glib-gettextize.xml \
1061 - gtester.xml \ 1022 - gtester.xml \
1062 - gtester-report.xml \ 1023 - gtester-report.xml \
1063 - gvariant-varargs.xml \ 1024 - gvariant-varargs.xml \
1064 - gvariant-text.xml 1025 - gvariant-text.xml
1065 - 1026 -
1066 -expand_content_files = \ 1027 -expand_content_files = \
1067 - compiling.sgml 1028 - compiling.xml
1068 - 1029 -
1069 -# Extra options to supply to gtkdoc-fixref 1030 -# Extra options to supply to gtkdoc-fixref
1070 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../gobject/html --extra-dir=$(srcdir)/../gio/html 1031 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../gobject/html --extra-dir=$(srcdir)/../gio/html
1071 - 1032 -
1072 -# include common portion ... 1033 -# include common portion ...
1081 - mainloop-states.eps \ 1042 - mainloop-states.eps \
1082 - version.xml.in 1043 - version.xml.in
1083 - 1044 -
1084 -######################################################################## 1045 -########################################################################
1085 - 1046 -
1086 -man_MANS = \ 1047 -man_MANS =
1048 -
1049 -if ENABLE_MAN
1050 -
1051 -man_MANS += \
1087 - glib-gettextize.1 \ 1052 - glib-gettextize.1 \
1088 - gtester.1 \ 1053 - gtester.1 \
1089 - gtester-report.1 1054 - gtester-report.1
1090 - 1055 -
1091 -if ENABLE_MAN 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
1092 - 1063 -
1093 -.xml.1: 1064 -.xml.1:
1094 - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< 1065 - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
1095 -
1096 -dist-local-check-mans-enabled:
1097 - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
1098 -
1099 -else
1100 -
1101 -$(man_MANS):
1102 - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
1103 - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@
1104 -
1105 -dist-local-check-mans-enabled:
1106 - echo "*** --enable-man must be used in order to make dist"
1107 - false
1108 - 1066 -
1109 -endif 1067 -endif
1110 - 1068 -
1111 -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) 1069 -CLEANFILES ?=
1070 -CLEANFILES += $(man_MANS)
1112 - 1071 -
1113 -EXTRA_DIST += $(man_MANS) 1072 -EXTRA_DIST += $(man_MANS)
1114 - 1073 -
1115 -dist-hook-local: dist-local-check-mans-enabled all-local 1074 -dist-hook-local: all-local
1116 - 1075 -
1117 -glib-docs-clean: clean 1076 -glib-docs-clean: clean
1118 - cd $(srcdir) && rm -rf xml html 1077 - cd $(srcdir) && rm -rf xml html
1119 diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am 1078 diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
1120 deleted file mode 100644 1079 deleted file mode 100644
1121 index 3a637b7..0000000 1080 index 48d88f8..0000000
1122 --- a/docs/reference/gobject/Makefile.am 1081 --- a/docs/reference/gobject/Makefile.am
1123 +++ /dev/null 1082 +++ /dev/null
1124 @@ -1,103 +0,0 @@ 1083 @@ -1,103 +0,0 @@
1125 -## Process this file with automake to produce Makefile.in 1084 -## Process this file with automake to produce Makefile.in
1126 -include $(top_srcdir)/Makefile.decl 1085 -include $(top_srcdir)/Makefile.decl
1129 - 1088 -
1130 -# The name of the module. 1089 -# The name of the module.
1131 -DOC_MODULE=gobject 1090 -DOC_MODULE=gobject
1132 - 1091 -
1133 -# The top-level SGML file. 1092 -# The top-level SGML file.
1134 -DOC_MAIN_SGML_FILE=gobject-docs.sgml 1093 -DOC_MAIN_SGML_FILE=gobject-docs.xml
1135 - 1094 -
1136 -# The directory containing the source code. Relative to $(srcdir) 1095 -# The directory containing the source code. Relative to $(srcdir)
1137 -DOC_SOURCE_DIR=$(top_srcdir)/gobject 1096 -DOC_SOURCE_DIR=$(top_srcdir)/gobject
1138 - 1097 -
1139 -# Extra options to supply to gtkdoc-scan 1098 -# Extra options to supply to gtkdoc-scan
1149 - 1108 -
1150 -# Headers to ignore 1109 -# Headers to ignore
1151 -IGNORE_HFILES = \ 1110 -IGNORE_HFILES = \
1152 - tests \ 1111 - tests \
1153 - gobject_trace.h \ 1112 - gobject_trace.h \
1113 - gtype-private.h \
1154 - gatomicarray.h 1114 - gatomicarray.h
1155 - 1115 -
1156 - 1116 -
1157 -# CFLAGS and LDFLAGS for compiling scan program. Only needed 1117 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
1158 -# if $(DOC_MODULE).types is non-empty. 1118 -# if $(DOC_MODULE).types is non-empty.
1190 - gobject.cI \ 1150 - gobject.cI \
1191 - version.xml.in 1151 - version.xml.in
1192 - 1152 -
1193 -######################################################################## 1153 -########################################################################
1194 - 1154 -
1195 -man_MANS = \ 1155 -man_MANS =
1156 -
1157 -if ENABLE_MAN
1158 -
1159 -man_MANS += \
1196 - glib-mkenums.1 \ 1160 - glib-mkenums.1 \
1197 - glib-genmarshal.1 \ 1161 - glib-genmarshal.1 \
1198 - gobject-query.1 1162 - gobject-query.1
1199 - 1163 -
1200 -if ENABLE_MAN 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
1201 - 1172 -
1202 -.xml.1: 1173 -.xml.1:
1203 - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< 1174 - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
1204 -
1205 -dist-local-check-mans-enabled:
1206 - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
1207 -
1208 -else
1209 -
1210 -$(man_MANS):
1211 - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
1212 - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@
1213 -
1214 -dist-local-check-mans-enabled:
1215 - echo "*** --enable-man must be used in order to make dist"
1216 - false
1217 - 1175 -
1218 -endif 1176 -endif
1219 - 1177 -
1220 -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) 1178 -CLEANFILES ?=
1179 -CLEANFILES += $(man_MANS)
1221 - 1180 -
1222 -EXTRA_DIST += $(man_MANS) 1181 -EXTRA_DIST += $(man_MANS)
1223 - 1182 -
1224 -dist-hook-local: dist-local-check-mans-enabled all-local 1183 -dist-hook-local: all-local
1225 - 1184 -
1226 -gobject-docs-clean: clean 1185 -gobject-docs-clean: clean
1227 - cd $(srcdir) && rm -rf xml html 1186 - cd $(srcdir) && rm -rf xml html
1228 -- 1187 --
1229 1.7.10.4 1188 1.7.10.4