d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

glib: update 2.42.1 --> 2.44.1 

no more gtk-doc dependence - simply issues warnings
This commit is contained in:
Tony Theodore 2015-09-15 05:55:43 +10:00
parent f4c92212e4
commit 06a18c9af8
2 changed files with 28 additions and 654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

678
src/glib-1-fixes.patch
View File

@ -3,10 +3,10 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From cea8581fa1d9e6eb39114d11f02bb9c17f366f41 Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
From 544cc902caf39c937bbac7c9f7b07f5fcb869d81 Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 Sep 2010 21:42:46 +0200
Subject: [PATCH 2/8] fix tool paths
Subject: [PATCH 1/6] fix tool paths
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
@ -27,13 +27,13 @@ index 275fc01..ac09887 100644
Name: GLib
Description: C Utility Library
--
1.8.4.5
2.3.2 (Apple Git-55)
From cc66017373a478c6954728dff0468e48b749c0f9 Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
From 10e38774090ee198d7f70e80f7dd29ef18dcd9d9 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 15 Jun 2012 15:25:01 +0200
Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically
Subject: [PATCH 2/6] Avoid DllMain symbol conflict when linking statically
diff --git a/gio/giomodule.c b/gio/giomodule.c
@ -88,17 +88,17 @@ index 24efe9d..6fb9e25 100644
LPVOID lpvReserved)
{
--
1.8.4.5
2.3.2 (Apple Git-55)
From 1e1ac2fa65a14491f3092355ae71ce304020b7f7 Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
From ca4e5a60cc9176279bd27a44c679e18666fac5e6 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 15 Jun 2012 15:27:22 +0200
Subject: [PATCH 4/8] Allow building without inotify support
Subject: [PATCH 3/6] Allow building without inotify support
diff --git a/configure.ac b/configure.ac
index 7739b89..5ec0ccd 100644
index 4a904a4..427d9e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1669,10 +1669,16 @@ dnl *****************************
@ -119,18 +119,18 @@ index 7739b89..5ec0ccd 100644
AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])
--
1.8.4.5
2.3.2 (Apple Git-55)
From 4e9c897df8226916c31d47022e4c6b45f4450070 Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
From 024bc122e81e418096281400b4b5340a7949eca1 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 15 Jun 2012 15:28:14 +0200
Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
Subject: [PATCH 4/6] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
Backported from upstream
diff --git a/configure.ac b/configure.ac
index 5ec0ccd..174c27f 100644
index 427d9e2..afb6232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -499,6 +499,8 @@ LT_INIT([disable-static win32-dll])
@ -143,13 +143,13 @@ index 5ec0ccd..174c27f 100644
AS_IF([test "$glib_native_win32" = "yes"], [
if test x$enable_static = xyes -a x$enable_shared = xyes; then
--
1.8.4.5
2.3.2 (Apple Git-55)
From d1e9341c08021818122fb60d1d7e6cd6deb3e8c7 Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
From bb1a73677634f3a70dbe5baac36ba8e6acf4f4cd Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 15 Jun 2012 15:29:06 +0200
Subject: [PATCH 6/8] Link with dnsapi
Subject: [PATCH 5/6] Link with dnsapi
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
@ -165,13 +165,13 @@ index 899af0c..b8308f8 100644
Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
Cflags:
--
1.8.4.5
2.3.2 (Apple Git-55)
From aa921eb646aac5cd48f669ebfcbc44a065dbf9ec Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
From bb796f32a497ef983e2e7483cab25b6142e15630 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 15 Jun 2012 15:29:38 +0200
Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not
Subject: [PATCH 6/6] Ensure globals are initialized even when DllMain is not
being run
@ -545,631 +545,5 @@ index 275ecc6..8285187 100644
g_thread_xp_init ();
--
1.8.4.5
From 596b53566e1f667321fbdec72b4c490afe000f4d Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
Date: Mon, 18 Jun 2012 16:02:12 +0200
Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific)
diff --git a/Makefile.am b/Makefile.am
index a1c9c33..d81491c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po tests
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
@@ -63,7 +63,6 @@ EXTRA_DIST += \
gio-unix-2.0.pc.in \
gio-windows-2.0.pc.in \
check-abis.sh \
- gtk-doc.make \
$(NULL)
diff --git a/autogen.sh b/autogen.sh
index 4bbc00d..bc0ab0b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,18 +7,6 @@ test -n "$srcdir" || srcdir=.
olddir=`pwd`
cd "$srcdir"
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
- echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
- rm -f gtk-doc.make
- cat > gtk-doc.make <<EOF
-EXTRA_DIST =
-CLEANFILES =
-EOF
-else
- gtkdocize || exit $?
-fi
-
AUTORECONF=`which autoreconf`
if test -z $AUTORECONF; then
echo "*** No autoreconf found, please install it ***"
diff --git a/configure.ac b/configure.ac
index 174c27f..5f033ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2579,13 +2579,6 @@ AS_IF([ test $cross_compiling = yes ], [
dnl **************************
dnl *** Checks for gtk-doc ***
dnl **************************
-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
-# it on it's own line.
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.20], [--flavour no-tmpl])
-],[
-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
-])
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index f956360..0000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = reference
-
-EXTRA_DIST = debugging.txt macros.txt
-
-files:
- @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
- echo $$p; \
- done
-
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
deleted file mode 100644
index 178aad1..0000000
--- a/docs/reference/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = glib gobject gio
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
deleted file mode 100644
index 47fdd38..0000000
--- a/docs/reference/gio/Makefile.am
+++ /dev/null
@@ -1,184 +0,0 @@
-NULL =
-
-SUBDIRS = gdbus-object-manager-example
-
-# The name of the module.
-DOC_MODULE=gio
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gio-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
- --ignore-decorators="G_GNUC_WARN_UNUSED_RESULT"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gio
-
-BUILT_HFILES=gioenumtypes.h
-HFILE_GLOB=$(top_srcdir)/gio/*.h
-CFILE_GLOB=$(top_srcdir)/gio/*.c
-
-IGNORE_HFILES = \
- fam \
- fen \
- gdbus-2.0 \
- gvdb \
- inotify \
- libasyncns \
- tests \
- win32 \
- xdgmime \
- gapplicationimpl.h \
- gasynchelper.h \
- gcontenttypeprivate.h \
- gdbusauth.h \
- gdbusauthmechanismanon.h \
- gdbusauthmechanismexternal.h \
- gdbusauthmechanism.h \
- gdbusauthmechanismsha1.h \
- gdbusprivate.h \
- gdelayedsettingsbackend.h \
- gdummyfile.h \
- gdummyproxyresolver.h \
- gdummytlsbackend.h \
- gfileattribute-priv.h \
- gfileinfo-priv.h \
- giomodule-priv.h \
- glocaldirectorymonitor.h \
- glocalfileenumerator.h \
- glocalfile.h \
- glocalfileinfo.h \
- glocalfileinputstream.h \
- glocalfileiostream.h \
- glocalfilemonitor.h \
- glocalfileoutputstream.h \
- glocalvfs.h \
- gmountprivate.h \
- gnativevolumemonitor.h \
- gnetworkingprivate.h \
- gnetworkmonitorbase.h \
- gnetworkmonitornetlink.h \
- gnotificationbackend.h \
- gnotification-private.h \
- gpollfilemonitor.h \
- gregistrysettingsbackend.h \
- gsettingsbackendinternal.h \
- gsettings-mapping.h \
- gsettingsschema-internal.h \
- gsocketinputstream.h \
- gsocketoutputstream.h \
- gsocks4aproxy.h \
- gsocks4proxy.h \
- gsocks5proxy.h \
- gsubprocesslauncher-private.h \
- gthreadedresolver.h \
- gunionvolumemonitor.h \
- gunixmount.h \
- gunixresolver.h \
- gunixvolume.h \
- gunixvolumemonitor.h \
- gwin32appinfo.h \
- gwin32mount.h \
- gwin32resolver.h \
- gwin32volumemonitor.h \
- thumbnail-verify.h
-
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = \
- $(gio_INCLUDES) \
- $(GLIB_DEBUG_FLAGS)
-
-GTKDOC_LIBS = \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gio/libgio-2.0.la \
- $(NULL)
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS = --output-format=xml --name-space=g \
- --ignore-files='libasyncns tests'
-
-# Images to copy into HTML directory
-HTML_IMAGES = \
- gvfs-overview.png \
- menu-example.png \
- menu-model.png
-
-content_files = \
- version.xml \
- overview.xml \
- migrating-posix.xml \
- migrating-gnome-vfs.xml \
- migrating-gconf.xml \
- migrating-gdbus.xml \
- gio-querymodules.xml \
- glib-compile-schemas.xml\
- glib-compile-resources.xml \
- gapplication.xml \
- gsettings.xml \
- gresource.xml \
- gdbus.xml \
- gdbus-codegen.xml \
- $(NULL)
-
-expand_content_files = \
- overview.xml \
- migrating-posix.xml \
- migrating-gnome-vfs.xml \
- migrating-gconf.xml \
- migrating-gdbus.xml \
- gdbus-codegen.xml \
- $(NULL)
-
-extra_files = \
- version.xml.in \
- gvfs-overview.odg
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html --extra-dir=$(srcdir)/../gobject/html
-
-include $(top_srcdir)/gtk-doc.make
-
-EXTRA_DIST += \
- version.xml.in
-
-man_MANS =
-
-if ENABLE_MAN
-
-man_MANS += \
- gapplication.1 \
- gio-querymodules.1 \
- glib-compile-schemas.1 \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
- gdbus.1 \
- gdbus-codegen.1
-
-XSLTPROC_FLAGS = \
- --nonet \
- --stringparam man.output.quietly 1 \
- --stringparam funcsynopsis.style ansi \
- --stringparam man.th.extra1.suppress 1 \
- --stringparam man.authors.section.enabled 0 \
- --stringparam man.copyright.section.enabled 0
-
-.xml.1:
- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-endif
-
-CLEANFILES ?=
-CLEANFILES += $(man_MANS)
-
-EXTRA_DIST += $(man_MANS)
-
-dist-hook-local: all-local
-
-gio-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
deleted file mode 100644
index 50b0f19..0000000
--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-NULL =
-
-# The name of the module.
-DOC_MODULE=gdbus-object-manager-example
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example
-
-HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
-CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
-
-# Headers to ignore
-IGNORE_HFILES = \
- $(NULL)
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = \
- $(gio_INCLUDES) \
- $(GLIB_DEBUG_FLAGS)
-
-GTKDOC_LIBS = \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gio/libgio-2.0.la \
- $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \
- $(NULL)
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
- $(NULL)
-
-# Images to copy into HTML directory
-HTML_IMAGES = \
- $(NULL)
-
-content_files = \
- $(NULL)
-
-expand_content_files = \
- $(NULL)
-
-extra_files = \
- $(NULL)
-
-include $(top_srcdir)/gtk-doc.make
-
-EXTRA_DIST += \
- $(NULL)
-
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-
-dist-hook-local: all-local
-
-gdbus-object-manager-example-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
-
-# Nuke installed docs (don't know how to avoid installing them)
-install-data-hook :
- rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
deleted file mode 100644
index a25a7c8..0000000
--- a/docs/reference/glib/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=glib
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=glib-docs.xml
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR|G_GNUC_WARN_UNUSED_RESULT"
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=g
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h
-CFILE_GLOB=$(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c
-
-# Ignore some private headers
-IGNORE_HFILES = \
- gallocator.h \
- gdatasetprivate.h \
- glibintl.h \
- gbsearcharray.h \
- glib-private.h \
- gmoduleconf.h \
- gthreadprivate.h \
- gunibreak.h \
- gunicomp.h \
- gunidecomp.h \
- gunichartables.h \
- glib_probes.h \
- glib_trace.h \
- libcharset.h \
- gdebug.h \
- gprintfint.h \
- gmirroringtable.h \
- gscripttable.h \
- glib-mirroring-tab \
- gnulib \
- pcre \
- update-pcre \
- gbytesprivate.h \
- gvariant-internal.h \
- gvariant-serialiser.h \
- gvariant-core.h \
- gvarianttypeinfo.h \
- gwakeup.h
-
-# Images to copy into HTML directory
-HTML_IMAGES = \
- file-name-encodings.png \
- mainloop-states.gif \
- Sorted_binary_tree_breadth-first_traversal.svg \
- Sorted_binary_tree_inorder.svg \
- Sorted_binary_tree_postorder.svg \
- Sorted_binary_tree_preorder.svg
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files = \
- cross.xml \
- running.xml \
- building.xml \
- changes.xml \
- compiling.xml \
- programming.xml \
- resources.xml \
- regex-syntax.xml \
- version.xml \
- glib-gettextize.xml \
- gtester.xml \
- gtester-report.xml \
- gvariant-varargs.xml \
- gvariant-text.xml
-
-expand_content_files = \
- compiling.xml
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../gobject/html --extra-dir=$(srcdir)/../gio/html
-
-# include common portion ...
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += \
- file-name-encodings.png \
- file-name-encodings.sxd \
- mainloop-states.fig \
- mainloop-states.png \
- mainloop-states.eps \
- Sorted_binary_tree_breadth-first_traversal.svg \
- Sorted_binary_tree_inorder.svg \
- Sorted_binary_tree_postorder.svg \
- Sorted_binary_tree_preorder.svg \
- version.xml.in
-
-########################################################################
-
-man_MANS =
-
-if ENABLE_MAN
-
-man_MANS += \
- glib-gettextize.1 \
- gtester.1 \
- gtester-report.1
-
-XSLTPROC_FLAGS = \
- --nonet \
- --stringparam man.output.quietly 1 \
- --stringparam funcsynopsis.style ansi \
- --stringparam man.th.extra1.suppress 1 \
- --stringparam man.authors.section.enabled 0 \
- --stringparam man.copyright.section.enabled 0
-
-.xml.1:
- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-endif
-
-CLEANFILES ?=
-CLEANFILES += $(man_MANS)
-
-EXTRA_DIST += $(man_MANS)
-
-dist-hook-local: all-local
-
-glib-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
deleted file mode 100644
index beff782..0000000
--- a/docs/reference/gobject/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=gobject
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gobject-docs.xml
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gobject
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
- --ignore-decorators="G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT"
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=g
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gobject/*.h
-CFILE_GLOB=$(top_srcdir)/gobject/*.c
-
-# Headers to ignore
-IGNORE_HFILES = \
- tests \
- gobject_trace.h \
- gtype-private.h \
- gatomicarray.h
-
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = \
- -I$(srcdir) \
- $(gobject_INCLUDES) \
- $(GLIB_DEBUG_FLAGS)
-
-GTKDOC_LIBS = \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la
-
-# Images to copy into HTML directory
-HTML_IMAGES = \
- images/glue.png
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files = version.xml \
- glib-mkenums.xml \
- glib-genmarshal.xml \
- gobject-query.xml \
- tut_gobject.xml \
- tut_gsignal.xml \
- tut_gtype.xml \
- tut_howto.xml \
- tut_intro.xml \
- tut_tools.xml
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += \
- gobject.cI \
- version.xml.in
-
-########################################################################
-
-man_MANS =
-
-if ENABLE_MAN
-
-man_MANS += \
- glib-mkenums.1 \
- glib-genmarshal.1 \
- gobject-query.1
-
-
-XSLTPROC_FLAGS = \
- --nonet \
- --stringparam man.output.quietly 1 \
- --stringparam funcsynopsis.style ansi \
- --stringparam man.th.extra1.suppress 1 \
- --stringparam man.authors.section.enabled 0 \
- --stringparam man.copyright.section.enabled 0
-
-.xml.1:
- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-endif
-
-CLEANFILES ?=
-CLEANFILES += $(man_MANS)
-
-EXTRA_DIST += $(man_MANS)
-
-dist-hook-local: all-local
-
-gobject-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
index d6d1412..79141ec 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -25,12 +25,6 @@ $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gi
test_ltlibraries = libgdbus-example-objectmanager.la
-if ENABLE_GTK_DOC
-# The docs pull these in, so we need them even if not doing 'make check'
-BUILT_SOURCES += $(GDBUS_GENERATED)
-noinst_LTLIBRARIES += libgdbus-example-objectmanager.la
-endif
-
nodist_libgdbus_example_objectmanager_la_SOURCES = \
gdbus-example-objectmanager-generated.h \
gdbus-example-objectmanager-generated.c
--
1.8.4.5
2.3.2 (Apple Git-55)

4
src/glib.mk
View File

@ -3,8 +3,8 @@
PKG := glib
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.42.1
$(PKG)_CHECKSUM := b5158fd434f01e84259155c04ff93026a090e586
$(PKG)_VERSION := 2.44.1
$(PKG)_CHECKSUM := 88176375f97ecd9ff45e7b5fd5ab80d4b7db6b34
$(PKG)_SUBDIR := glib-$($(PKG)_VERSION)
$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)