From f60117b41d5433be1b4a96d82cd11d0c3dce9b63 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Apr 2018 18:00:21 +0200 Subject: New upstream version 1.11.3 --- docs/libnm-util/Makefile.am | 15 +++++---------- docs/libnm-util/Makefile.in | 21 +++++++++------------ docs/libnm-util/html/index.html | 2 +- docs/libnm-util/meson.build | 32 ++++++++++++++++++++++++++++++++ docs/libnm-util/version.xml | 2 +- 5 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 docs/libnm-util/meson.build (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index b1386e60..5b8d7260 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -17,9 +17,6 @@ DOC_SOURCE_DIR= \ # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections -# Extra options to supply to gtkdoc-scangobj. -SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();' - # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml @@ -33,7 +30,6 @@ CFILE_GLOB=$(top_srcdir)/libnm-util/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ crypto.h \ - nm-setting-template.h \ nm-utils-private.h \ nm-setting-private.h \ nm-param-spec-specialized.h \ @@ -41,7 +37,7 @@ IGNORE_HFILES= \ nm-version.h # Images to copy into HTML directory. -HTML_IMAGES = +HTML_IMAGES = # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). content_files = version.xml @@ -52,11 +48,10 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-util \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) GTKDOC_LIBS = \ @@ -68,7 +63,7 @@ GTKDOC_LIBS = \ # include common portion ... include $(top_srcdir)/gtk-doc.make -EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in meson.build CLEANFILES += \ libnm-util-sections.txt \ diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 6471f826..63858099 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -209,7 +209,7 @@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -263,14 +263,13 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ LIBNDP_LIBS = @LIBNDP_LIBS@ -LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBS = @LIBS@ LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ +LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ @@ -341,8 +340,11 @@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ -SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ +SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@ +SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@ +SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@ +SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -465,9 +467,6 @@ DOC_SOURCE_DIR = \ # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS = --rebuild-types --rebuild-sections -# Extra options to supply to gtkdoc-scangobj. -SCANGOBJ_OPTIONS = --type-init-func 'g_type_init();' - # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS = --sgml-mode --output-format=xml @@ -481,7 +480,6 @@ CFILE_GLOB = $(top_srcdir)/libnm-util/*.c # Header files to ignore when scanning. IGNORE_HFILES = \ crypto.h \ - nm-setting-template.h \ nm-utils-private.h \ nm-setting-private.h \ nm-param-spec-specialized.h \ @@ -501,10 +499,9 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-util \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) GTKDOC_LIBS = \ @@ -534,7 +531,7 @@ SETUP_FILES = \ # include common portion ... -EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in meson.build DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ sgml.stamp html.stamp pdf.stamp diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index 83ae4a9f..99edcddf 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,7 +15,7 @@

- for libnm-util 1.10.6 + for libnm-util 1.11.3 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-util/stable/. diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build new file mode 100644 index 00000000..7b06baf3 --- /dev/null +++ b/docs/libnm-util/meson.build @@ -0,0 +1,32 @@ +doc_module = libnm_util_name + +private_headers = [ + 'crypto.h', + 'nm-utils-private.h', + 'nm-setting-private.h', + 'nm-param-spec-specialized.h', + 'nm-test-utils.h', + 'nm-version.h' +] + +configure_file( + input: version_xml + '.in', + output: version_xml, + configuration: version_conf +) + +gnome.gtkdoc( + doc_module, + main_xml: doc_module + '-docs.sgml', + src_dir: libnm_util_inc, + dependencies: libnm_util_dep, + scan_args: [ + '--rebuild-types', + '--rebuild-sections', + '--ignore-headers=' + ' '.join(private_headers) + ], + scanobjs_args: '--type-init-func="g_type_init();"', + fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)), + gobject_typesfile: doc_module + '.types', + install: true +) diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index 7b4d9a4f..0a5af26d 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.10.6 +1.11.3 -- cgit 1.3.0-6-gf8a5 From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 May 2018 22:08:45 +0200 Subject: New upstream version 1.10.8 --- docs/libnm-util/Makefile.am | 15 ++++++++++----- docs/libnm-util/Makefile.in | 21 ++++++++++++--------- docs/libnm-util/html/index.html | 2 +- docs/libnm-util/meson.build | 32 -------------------------------- docs/libnm-util/version.xml | 2 +- 5 files changed, 24 insertions(+), 48 deletions(-) delete mode 100644 docs/libnm-util/meson.build (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 5b8d7260..b1386e60 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -17,6 +17,9 @@ DOC_SOURCE_DIR= \ # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections +# Extra options to supply to gtkdoc-scangobj. +SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();' + # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml @@ -30,6 +33,7 @@ CFILE_GLOB=$(top_srcdir)/libnm-util/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ crypto.h \ + nm-setting-template.h \ nm-utils-private.h \ nm-setting-private.h \ nm-param-spec-specialized.h \ @@ -37,7 +41,7 @@ IGNORE_HFILES= \ nm-version.h # Images to copy into HTML directory. -HTML_IMAGES = +HTML_IMAGES = # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). content_files = version.xml @@ -48,10 +52,11 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-util \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libnm-util \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) GTKDOC_LIBS = \ @@ -63,7 +68,7 @@ GTKDOC_LIBS = \ # include common portion ... include $(top_srcdir)/gtk-doc.make -EXTRA_DIST += version.xml.in meson.build +EXTRA_DIST += version.xml.in CLEANFILES += \ libnm-util-sections.txt \ diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 63858099..6471f826 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -209,7 +209,7 @@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -263,13 +263,14 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ LIBNDP_LIBS = @LIBNDP_LIBS@ +LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBS = @LIBS@ LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ -LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ @@ -340,11 +341,8 @@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ -SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@ -SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@ -SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@ -SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -467,6 +465,9 @@ DOC_SOURCE_DIR = \ # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS = --rebuild-types --rebuild-sections +# Extra options to supply to gtkdoc-scangobj. +SCANGOBJ_OPTIONS = --type-init-func 'g_type_init();' + # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS = --sgml-mode --output-format=xml @@ -480,6 +481,7 @@ CFILE_GLOB = $(top_srcdir)/libnm-util/*.c # Header files to ignore when scanning. IGNORE_HFILES = \ crypto.h \ + nm-setting-template.h \ nm-utils-private.h \ nm-setting-private.h \ nm-param-spec-specialized.h \ @@ -499,9 +501,10 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-util \ + -I$(top_srcdir)/libnm-util \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) GTKDOC_LIBS = \ @@ -531,7 +534,7 @@ SETUP_FILES = \ # include common portion ... -EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in meson.build +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ sgml.stamp html.stamp pdf.stamp diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index 99edcddf..e8be13c8 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,7 +15,7 @@

- for libnm-util 1.11.3 + for libnm-util 1.10.8 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-util/stable/. diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build deleted file mode 100644 index 7b06baf3..00000000 --- a/docs/libnm-util/meson.build +++ /dev/null @@ -1,32 +0,0 @@ -doc_module = libnm_util_name - -private_headers = [ - 'crypto.h', - 'nm-utils-private.h', - 'nm-setting-private.h', - 'nm-param-spec-specialized.h', - 'nm-test-utils.h', - 'nm-version.h' -] - -configure_file( - input: version_xml + '.in', - output: version_xml, - configuration: version_conf -) - -gnome.gtkdoc( - doc_module, - main_xml: doc_module + '-docs.sgml', - src_dir: libnm_util_inc, - dependencies: libnm_util_dep, - scan_args: [ - '--rebuild-types', - '--rebuild-sections', - '--ignore-headers=' + ' '.join(private_headers) - ], - scanobjs_args: '--type-init-func="g_type_init();"', - fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)), - gobject_typesfile: doc_module + '.types', - install: true -) diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index 0a5af26d..3cc3669f 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.11.3 +1.10.8 -- cgit 1.3.0-6-gf8a5