From eba983b1996c655932d9249f3c127f4b7934b0d6 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 29 Sep 2017 11:04:33 +0900 Subject: [PATCH] Imported Upstream version 1.22 Change-Id: I4152c1414b31a6e6d1f2db95b6e9809ce545ede2 Signed-off-by: DongHun Kwak --- INSTALL | 12 +- Makefile.in | 394 +- NEWS | 52 + aclocal.m4 | 745 ++-- build-aux/compile | 347 ++ build-aux/config.guess | 184 +- build-aux/config.sub | 106 +- build-aux/depcomp | 487 ++- build-aux/install-sh | 14 +- build-aux/ltmain.sh | 4 +- build-aux/missing | 414 +- build-aux/test-driver | 139 + configure | 891 ++-- configure.ac | 6 +- devhelp2.xsl | 6 +- examples/Makefile.am | 38 +- gtk-doc.doap | 19 +- gtk-doc.flat.make | 20 +- gtk-doc.make | 20 +- gtk-doc.notmpl-flat.make | 20 +- gtk-doc.notmpl.make | 20 +- gtk-doc.spec | 2 +- gtk-doc.xsl | 66 +- gtkdoc-common.pl | 8 +- gtkdoc-common.pl.in | 8 +- gtkdoc-depscan.in | 4 +- gtkdoc-mkdb.in | 313 +- gtkdoc-mkhtml.in | 8 + gtkdoc-mkpdf.in | 3 + gtkdoc-mktmpl.in | 8 + gtkdoc-scan.in | 28 +- gtkdocize.in | 4 +- help/Makefile.in | 271 +- help/manual/C/fdl-appendix.xml | 2 +- help/manual/C/index.docbook | 114 +- help/manual/Makefile.am | 2 +- help/manual/Makefile.in | 99 +- help/manual/bn_IN/fdl-appendix.xml | 2 +- help/manual/bn_IN/index.docbook | 116 +- help/manual/de/fdl-appendix.xml | 8 +- help/manual/de/index.docbook | 108 +- help/manual/el/el.po | 1004 ++--- help/manual/el/fdl-appendix.xml | 10 +- help/manual/el/index.docbook | 336 +- help/manual/en_GB/fdl-appendix.xml | 8 +- help/manual/en_GB/index.docbook | 126 +- help/manual/es/es.po | 1154 ++--- help/manual/es/fdl-appendix.xml | 2 +- help/manual/es/index.docbook | 73 +- help/manual/fr/fdl-appendix.xml | 8 +- help/manual/fr/index.docbook | 110 +- help/manual/gl/fdl-appendix.xml | 621 +++ help/manual/gl/gl.po | 3842 +++++++++++++++++ .../manual/gl/gl.stamp | 0 help/manual/gl/index.docbook | 2564 +++++++++++ help/manual/gu/fdl-appendix.xml | 2 +- help/manual/gu/index.docbook | 98 +- help/manual/pt_BR/fdl-appendix.xml | 8 +- help/manual/pt_BR/index.docbook | 112 +- help/manual/pt_BR/pt_BR.po | 601 +-- help/manual/sl/fdl-appendix.xml | 2 +- help/manual/sl/index.docbook | 120 +- help/manual/sv/fdl-appendix.xml | 8 +- help/manual/sv/index.docbook | 126 +- help/manual/ta/fdl-appendix.xml | 2 +- help/manual/ta/index.docbook | 98 +- help/manual/te/fdl-appendix.xml | 2 +- help/manual/te/index.docbook | 98 +- help/manual/zh_CN/fdl-appendix.xml | 2 +- help/manual/zh_CN/index.docbook | 98 +- m4/libtool.m4 | 52 +- style/style.css | 15 +- tests/Makefile.in | 771 +++- tests/annotations/Makefile.in | 272 +- tests/annotations/docs/Makefile.in | 98 +- tests/annotations/docs/tester-docs.xml | 2 +- tests/annotations/docs/tester-sections.txt | 2 + tests/annotations/src/Makefile.in | 202 +- tests/annotations/src/tester.c | 19 + tests/annotations/src/tester.h | 3 + tests/bugs/Makefile.in | 272 +- tests/bugs/docs/Makefile.in | 98 +- tests/bugs/docs/tester-sections.txt | 3 + tests/bugs/src/Makefile.in | 202 +- tests/bugs/src/tester.c | 23 + tests/bugs/src/tester.h | 7 + tests/empty/Makefile.in | 272 +- tests/empty/docs/Makefile.in | 98 +- tests/empty/docs/tester-docs.xml | 5 +- tests/empty/src/Makefile.in | 202 +- tests/fail/Makefile.in | 272 +- tests/fail/docs/Makefile.in | 98 +- tests/fail/src/Makefile.in | 202 +- tests/gobject/Makefile.am | 2 +- tests/gobject/Makefile.in | 274 +- tests/gobject/docs-tmpl/Makefile.am | 88 - tests/gobject/docs-tmpl/Makefile.in | 716 --- tests/gobject/docs-tmpl/images/object.png | Bin 4101 -> 0 bytes tests/gobject/docs-tmpl/tester-docs.xml | 102 - tests/gobject/docs-tmpl/tester-sections.txt | 79 - tests/gobject/docs-tmpl/tester.types | 8 - tests/gobject/docs/Makefile.in | 98 +- tests/gobject/docs/tester-docs.xml | 2 + tests/gobject/src/Makefile.in | 202 +- tests/gobject/src/gobject.c | 9 +- tests/gobject/src/gtypes.h | 2 +- tests/gtk-doc.make | 233 - tests/tools.sh | 2 +- tests/tools.sh.in | 2 +- 109 files changed, 15163 insertions(+), 6193 deletions(-) create mode 100755 build-aux/compile create mode 100755 build-aux/test-driver create mode 100644 help/manual/gl/fdl-appendix.xml create mode 100644 help/manual/gl/gl.po rename tests/gobject/docs-tmpl/tester-overrides.txt => help/manual/gl/gl.stamp (100%) create mode 100644 help/manual/gl/index.docbook delete mode 100644 tests/gobject/docs-tmpl/Makefile.am delete mode 100644 tests/gobject/docs-tmpl/Makefile.in delete mode 100644 tests/gobject/docs-tmpl/images/object.png delete mode 100644 tests/gobject/docs-tmpl/tester-docs.xml delete mode 100644 tests/gobject/docs-tmpl/tester-sections.txt delete mode 100644 tests/gobject/docs-tmpl/tester.types delete mode 100644 tests/gtk-doc.make diff --git a/INSTALL b/INSTALL index a1e89e1..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/Makefile.in b/Makefile.in index a4ed9fa..81ef200 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,20 +83,26 @@ host_triplet = @host@ @HAVE_PYTHON_TRUE@ gtkdoc-depscan subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gtk-doc.cat.in \ - $(srcdir)/gtk-doc.dsl.in $(srcdir)/gtk-doc.pc.in \ - $(srcdir)/gtk-doc.spec.in $(srcdir)/gtkdoc-check.in \ - $(srcdir)/gtkdoc-common.pl.in $(srcdir)/gtkdoc-depscan.in \ - $(srcdir)/gtkdoc-fixxref.in $(srcdir)/gtkdoc-mkdb.in \ - $(srcdir)/gtkdoc-mkhtml.in $(srcdir)/gtkdoc-mkman.in \ - $(srcdir)/gtkdoc-mkpdf.in $(srcdir)/gtkdoc-mktmpl.in \ - $(srcdir)/gtkdoc-rebase.in $(srcdir)/gtkdoc-scan.in \ - $(srcdir)/gtkdoc-scangobj.in $(srcdir)/gtkdocize.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO build-aux/config.guess build-aux/config.sub \ - build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ - build-aux/missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/gtk-doc.pc.in $(srcdir)/gtk-doc.dsl.in \ + $(srcdir)/gtk-doc.spec.in $(srcdir)/gtk-doc.cat.in \ + $(srcdir)/gtkdoc-common.pl.in $(srcdir)/gtkdoc-check.in \ + $(srcdir)/gtkdoc-depscan.in $(srcdir)/gtkdoc-fixxref.in \ + $(srcdir)/gtkdoc-mkdb.in $(srcdir)/gtkdoc-mkhtml.in \ + $(srcdir)/gtkdoc-mkman.in $(srcdir)/gtkdoc-mkpdf.in \ + $(srcdir)/gtkdoc-mktmpl.in $(srcdir)/gtkdoc-rebase.in \ + $(srcdir)/gtkdoc-scan.in $(srcdir)/gtkdoc-scangobj.in \ + $(srcdir)/gtkdocize.in COPYING TODO build-aux/compile \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -101,30 +151,63 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" \ "$(DESTDIR)$(gtkdocdatadir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(sgmldir)" SCRIPTS = $(bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(aclocal_DATA) $(gtkdocdata_DATA) $(pkgconfig_DATA) \ $(sgml_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -135,6 +218,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -162,6 +246,7 @@ am__relativize = \ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -257,6 +342,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -473,8 +560,11 @@ gtkdocize: $(top_builddir)/config.status $(srcdir)/gtkdocize.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -529,8 +619,11 @@ distclean-libtool: -rm -f libtool config.lt install-aclocalDATA: $(aclocal_DATA) @$(NORMAL_INSTALL) - test -z "$(aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" @list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -547,8 +640,11 @@ uninstall-aclocalDATA: dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir) install-gtkdocdataDATA: $(gtkdocdata_DATA) @$(NORMAL_INSTALL) - test -z "$(gtkdocdatadir)" || $(MKDIR_P) "$(DESTDIR)$(gtkdocdatadir)" @list='$(gtkdocdata_DATA)'; test -n "$(gtkdocdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gtkdocdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gtkdocdatadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -565,8 +661,11 @@ uninstall-gtkdocdataDATA: dir='$(DESTDIR)$(gtkdocdatadir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -583,8 +682,11 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-sgmlDATA: $(sgml_DATA) @$(NORMAL_INSTALL) - test -z "$(sgmldir)" || $(MKDIR_P) "$(DESTDIR)$(sgmldir)" @list='$(sgml_DATA)'; test -n "$(sgmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sgmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sgmldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -601,22 +703,25 @@ uninstall-sgmlDATA: dir='$(DESTDIR)$(sgmldir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -631,57 +736,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -697,12 +757,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -714,15 +769,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -731,9 +782,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) @case `sed 15q $(srcdir)/NEWS` in \ @@ -775,13 +848,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -813,39 +883,41 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -856,8 +928,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -869,18 +939,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -903,7 +974,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1046,27 +1117,26 @@ uninstall-am: uninstall-aclocalDATA uninstall-binSCRIPTS \ uninstall-gtkdocdataDATA uninstall-pkgconfigDATA \ uninstall-sgmlDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-aclocalDATA install-am install-binSCRIPTS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-gtkdocdataDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-sgmlDATA install-strip \ - installcheck installcheck-am installcheck-binSCRIPTS \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-aclocalDATA uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-libtool distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-aclocalDATA install-am \ + install-binSCRIPTS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-gtkdocdataDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-sgmlDATA install-strip installcheck installcheck-am \ + installcheck-binSCRIPTS installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-aclocalDATA uninstall-am \ uninstall-binSCRIPTS uninstall-gtkdocdataDATA \ uninstall-pkgconfigDATA uninstall-sgmlDATA diff --git a/NEWS b/NEWS index 05b4e74..406cb49 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,55 @@ +GTK-Doc 1.22 (May 07 2014) +============ + + Important notice - starting with the next release these long deprecated + features will be removed - you'll now see a warning if you actually use these + features. Please write to gtk-doc-list@gnome.org and tell us your concerns: + o gtkdoc-mktmpl - please move all the comments into the sources. + o generating html via sgml tools (jade/openjade), using xsltproc and + docbook-xslt is pretty common and preferred since version 1.6 + + Changes + + o 727778 : –   gtk-doc doesn't understand annotations for GList-contained types + o 729911 : Using #TypeName inshort_description makes " - " in HTML index disappear + o 732689 : strange result on a generated html page + o 734689 : " Specific - > General " document title format + o 736073 : Regression: problems with enum constants + o 736725 : Documentation consists mostly of empty space + o 741305 : Scanner issue with enum containing value ='{' + o 741763 : Example Makefile.am improvements + o 741941 : Last function argument missing in docs (possibly due to macro in code) + o 743879 : special case G_DECLARE_*_TYPE + o 743967 : Make build results reproducible + o 744075 : Missing struct members if forward declared in another header + o 744368 : gtkdoc-depscan doesn't handle unicode in .devhelp2 files correctly + o 746118 : gtkdoc-scan: fix regex for get_type() functions + o 746120 : Expand annotation recognition on symbol lines + o 746121 : gtkdoc-mkdb: don't warn on 'deprecated entities' + o 747207 : Typos in documentation + o 747298 : Test still tries to check gtkdoc-scanobj + o 748456 : xsl: Enable ToC generation on empty < toc/ > elements + + Contributors + + Anders Jonsson + Andre Klapper + Daniel Mustieles + David King + Dominique Leuenberger + Efstathios Iosifidis + Emanuele Aina + Fran Diéguez + Maria Mavridou + Marvin Schmidt + Olav Vitters + Philip Withnall + Rafael Ferreira + Ryan Lortie + Stefan Sauer + Tom Tryfonidis + Xavier Claessens + GTK-Doc 1.21 (Jul 17 2014) ============ diff --git a/aclocal.m4 b/aclocal.m4 index b1fecda..100e4a6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -186,8 +186,24 @@ AC_REQUIRE([AC_PROG_LN_S]) m4_pattern_allow([AM_V_at]) m4_pattern_allow([AM_V_GEN]) m4_pattern_allow([AM_DEFAULT_VERBOSITY]) + +YELP_LC_MEDIA_LINKS=true +YELP_LC_DIST=true + +for yelpopt in [$1]; do + case $yelpopt in + lc-media-links) YELP_LC_MEDIA_LINKS=true ;; + no-lc-media-links) YELP_LC_MEDIA_LINKS= ;; + lc-dist) YELP_LC_DIST=true ;; + no-lc-dist) YELP_LC_DIST= ;; + *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;; + esac +done; +AC_SUBST([YELP_LC_MEDIA_LINKS]) +AC_SUBST([YELP_LC_DIST]) + AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], + AS_HELP_STRING([--with-help-dir=DIR], [path where help files are installed]),, [with_help_dir='${datadir}/help']) HELP_DIR="$with_help_dir" @@ -234,7 +250,8 @@ all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HEL .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") .PHONY: repo repo: $(_HELP_POTFILE) @@ -279,13 +296,13 @@ clean-help: EXTRA_DIST ?= EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)) EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) distdir: distdir-help-files distdir-help-files: - @for lc in C $(HELP_LINGUAS); do \ + @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ $(MKDIR_P) "$(distdir)/$$lc"; \ for file in $(HELP_FILES); do \ if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ @@ -343,8 +360,10 @@ install-help: echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ fi; \ done; \ done @@ -375,25 +394,22 @@ AC_SUBST([YELP_HELP_RULES]) m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) ]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -409,24 +425,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -445,7 +459,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -471,22 +485,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -505,16 +516,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -524,7 +533,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -537,12 +546,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -550,8 +560,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -591,16 +601,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -609,8 +619,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -618,7 +628,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -666,7 +676,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -676,9 +686,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -693,20 +707,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -719,7 +731,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -731,21 +743,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -763,7 +773,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -773,18 +783,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -797,7 +810,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -826,31 +839,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -861,34 +883,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -910,15 +976,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -932,16 +995,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -958,20 +1019,17 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -982,10 +1040,11 @@ AC_DEFUN([AM_MAINTAINER_MODE], AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -993,18 +1052,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -1022,7 +1077,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -1049,15 +1104,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -1065,11 +1117,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -1082,54 +1133,22 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -1139,7 +1158,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -1153,14 +1172,59 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- @@ -1189,7 +1253,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -1205,10 +1269,11 @@ AC_DEFUN([AM_PATH_PYTHON], dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -1257,6 +1322,25 @@ AC_DEFUN([AM_PATH_PYTHON], [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" dnl Set up 4 directories: @@ -1273,7 +1357,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -1308,7 +1399,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -1356,14 +1454,12 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1377,22 +1473,16 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1403,32 +1493,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1438,31 +1536,50 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1480,7 +1597,7 @@ else am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1497,44 +1614,40 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1548,18 +1661,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1569,76 +1680,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/build-aux/compile b/build-aux/compile new file mode 100755 index 0000000..531136b --- /dev/null +++ b/build-aux/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/build-aux/config.guess b/build-aux/config.guess index d622a44..b79252d 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,10 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -267,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -285,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -364,13 +366,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -401,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -782,11 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1013,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1486,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1546,12 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1577,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index bd0ac08..4ebd5b3 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,8 +39,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,26 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -122,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -131,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -145,33 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -189,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -198,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -247,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -258,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -307,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -319,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -332,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -343,77 +461,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -424,8 +526,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -443,14 +544,15 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -478,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -562,11 +664,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -583,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -602,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -637,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/build-aux/install-sh b/build-aux/install-sh index a9244eb..377bb86 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index c2852d8..a356aca 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff --git a/build-aux/missing b/build-aux/missing index 86a8fc3..db98974 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/build-aux/test-driver b/build-aux/test-driver new file mode 100755 index 0000000..d306056 --- /dev/null +++ b/build-aux/test-driver @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure b/configure index 8f15e1b..c24739e 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gtk-doc 1.21. +# Generated by GNU Autoconf 2.69 for gtk-doc 1.22. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -571,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gtk-doc' PACKAGE_TARNAME='gtk-doc' -PACKAGE_VERSION='1.21' -PACKAGE_STRING='gtk-doc 1.21' +PACKAGE_VERSION='1.22' +PACKAGE_STRING='gtk-doc 1.22' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc' PACKAGE_URL='' @@ -623,6 +643,8 @@ YELP_HELP_RULES XMLLINT ITSTOOL HELP_DIR +YELP_LC_DIST +YELP_LC_MEDIA_LINKS DATE_FMT_CMD ELAPSED_FMT TS_FMT @@ -706,13 +728,13 @@ CPPFLAGS LDFLAGS CFLAGS CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -777,8 +799,8 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode enable_dependency_tracking enable_shared enable_static @@ -1264,8 +1286,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1351,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtk-doc 1.21 to adapt to many kinds of systems. +\`configure' configures gtk-doc 1.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1441,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtk-doc 1.21:";; + short | recursive ) echo "Configuration of gtk-doc 1.22:";; esac cat <<\_ACEOF @@ -1429,12 +1449,15 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1544,10 +1567,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtk-doc configure 1.21 -generated by GNU Autoconf 2.68 +gtk-doc configure 1.22 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1623,7 +1646,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1822,8 +1845,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtk-doc $as_me 1.21, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by gtk-doc $as_me 1.22, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2203,7 +2226,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2242,7 +2265,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2300,9 +2323,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2313,32 +2333,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2350,6 +2378,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2372,12 +2410,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2389,10 +2427,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2411,7 +2449,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2451,7 +2489,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2502,7 +2540,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2531,12 +2569,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2555,7 +2587,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2619,6 +2651,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2641,7 +2712,7 @@ fi # Define the identity of the package. PACKAGE='gtk-doc' - VERSION='1.21' + VERSION='1.22' cat >>confdefs.h <<_ACEOF @@ -2669,6 +2740,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -2676,86 +2753,125 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -2763,6 +2879,48 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -2794,10 +2952,10 @@ if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -2852,7 +3010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2892,7 +3050,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2945,7 +3103,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2986,7 +3144,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3044,7 +3202,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3088,7 +3246,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3534,8 +3692,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3619,6 +3776,65 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3638,7 +3854,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3694,8 +3910,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3730,16 +3946,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3748,8 +3964,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3757,7 +3973,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4001,7 +4217,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4077,7 +4293,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4143,7 +4359,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4210,7 +4426,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4466,7 +4682,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4510,7 +4726,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4699,7 +4915,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -4934,7 +5151,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4974,7 +5191,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5100,10 +5317,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5142,7 +5355,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5280,7 +5493,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5320,7 +5533,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5424,7 +5637,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5468,7 +5681,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5593,7 +5806,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5633,7 +5846,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5692,7 +5905,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5732,7 +5945,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6224,7 +6437,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6240,9 +6453,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6261,7 +6484,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6381,7 +6607,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6421,7 +6647,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6501,7 +6727,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6541,7 +6767,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6593,7 +6819,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6633,7 +6859,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6685,7 +6911,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6725,7 +6951,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6777,7 +7003,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6817,7 +7043,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6869,7 +7095,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6909,7 +7135,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8069,7 +8295,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10239,17 +10465,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10366,7 +10581,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11440,7 +11655,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11483,7 +11698,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11552,7 +11767,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11597,8 +11812,8 @@ fi if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5 -$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.3" >&5 +$as_echo_n "checking whether $PYTHON version is >= 2.3... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -11616,7 +11831,9 @@ sys.exit(sys.hexversion < minverhex)" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "too old" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -11628,7 +11845,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -11672,7 +11889,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11735,6 +11952,25 @@ $as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[:3] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 @@ -11748,7 +11984,14 @@ else else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -11785,7 +12028,14 @@ else else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -11843,7 +12093,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JADE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11885,7 +12135,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JADE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11932,7 +12182,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11976,7 +12226,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DBLATEX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12017,7 +12267,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12108,7 +12358,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12212,7 +12462,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12255,7 +12505,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12298,7 +12548,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12354,7 +12604,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12583,6 +12833,22 @@ $as_echo "yes" >&6; } +YELP_LC_MEDIA_LINKS=true +YELP_LC_DIST=true + +for yelpopt in ; do + case $yelpopt in + lc-media-links) YELP_LC_MEDIA_LINKS=true ;; + no-lc-media-links) YELP_LC_MEDIA_LINKS= ;; + lc-dist) YELP_LC_DIST=true ;; + no-lc-dist) YELP_LC_DIST= ;; + *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;; + esac +done; + + + + # Check whether --with-help-dir was given. if test "${with_help_dir+set}" = set; then : withval=$with_help_dir; @@ -12610,7 +12876,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ITSTOOL="itstool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12652,7 +12918,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_XMLLINT="xmllint" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12706,7 +12972,8 @@ all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HEL .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") .PHONY: repo repo: $(_HELP_POTFILE) @@ -12751,13 +13018,13 @@ clean-help: EXTRA_DIST ?= EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)) EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) distdir: distdir-help-files distdir-help-files: - @for lc in C $(HELP_LINGUAS); do \ + @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ $(MKDIR_P) "$(distdir)/$$lc"; \ for file in $(HELP_FILES); do \ if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ @@ -12815,8 +13082,10 @@ install-help: echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ fi; \ done; \ done @@ -12861,7 +13130,7 @@ else fi -ac_config_files="$ac_config_files Makefile gtk-doc.pc gtk-doc.dsl gtk-doc.spec gtk-doc.cat gtkdoc-common.pl help/Makefile help/manual/Makefile tests/Makefile tests/gobject/Makefile tests/gobject/src/Makefile tests/gobject/docs/Makefile tests/gobject/docs-tmpl/Makefile tests/bugs/Makefile tests/bugs/src/Makefile tests/bugs/docs/Makefile tests/annotations/Makefile tests/annotations/src/Makefile tests/annotations/docs/Makefile tests/fail/Makefile tests/fail/src/Makefile tests/fail/docs/Makefile tests/empty/Makefile tests/empty/src/Makefile tests/empty/docs/Makefile" +ac_config_files="$ac_config_files Makefile gtk-doc.pc gtk-doc.dsl gtk-doc.spec gtk-doc.cat gtkdoc-common.pl help/Makefile help/manual/Makefile tests/Makefile tests/gobject/Makefile tests/gobject/src/Makefile tests/gobject/docs/Makefile tests/bugs/Makefile tests/bugs/src/Makefile tests/bugs/docs/Makefile tests/annotations/Makefile tests/annotations/src/Makefile tests/annotations/docs/Makefile tests/fail/Makefile tests/fail/src/Makefile tests/fail/docs/Makefile tests/empty/Makefile tests/empty/src/Makefile tests/empty/docs/Makefile" ac_config_files="$ac_config_files gtkdoc-check" @@ -13035,6 +13304,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -13369,16 +13646,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -13438,28 +13715,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -13480,8 +13745,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtk-doc $as_me 1.21, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by gtk-doc $as_me 1.22, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13537,11 +13802,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtk-doc config.status 1.21 -configured by $0, generated by GNU Autoconf 2.68, +gtk-doc config.status 1.22 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13621,7 +13886,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -13946,7 +14211,6 @@ do "tests/gobject/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gobject/Makefile" ;; "tests/gobject/src/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gobject/src/Makefile" ;; "tests/gobject/docs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gobject/docs/Makefile" ;; - "tests/gobject/docs-tmpl/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gobject/docs-tmpl/Makefile" ;; "tests/bugs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/bugs/Makefile" ;; "tests/bugs/src/Makefile") CONFIG_FILES="$CONFIG_FILES tests/bugs/src/Makefile" ;; "tests/bugs/docs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/bugs/docs/Makefile" ;; @@ -14402,7 +14666,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -14415,7 +14679,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -14449,21 +14713,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -15215,11 +15477,6 @@ test "x$enable_debug" != "xno" \ $as_echo "$as_me: ** Debug tracing enabled" >&6;} \ || { $as_echo "$as_me:${as_lineno-$LINENO}: Debug tracing disabled" >&5 $as_echo "$as_me: Debug tracing disabled" >&6;} -test "x$enable_debug" != "xno" \ - && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Debug tracing enabled" >&5 -$as_echo "$as_me: ** Debug tracing enabled" >&6;} \ - || { $as_echo "$as_me:${as_lineno-$LINENO}: Debug tracing disabled" >&5 -$as_echo "$as_me: Debug tracing disabled" >&6;} test "x$have_yelp_tools" != "xno" \ && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Documentation enabled" >&5 $as_echo "$as_me: ** Documentation enabled" >&6;} \ diff --git a/configure.ac b/configure.ac index e7da82c..ccbc1d0 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl Use a simple 2-digit version number for a while, since our old example dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9. dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit dnl number for the development version -m4_define(gtk_doc_version, 1.21) +m4_define(gtk_doc_version, 1.22) AC_INIT([gtk-doc],[gtk_doc_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc],[gtk-doc]) @@ -264,7 +264,6 @@ tests/Makefile tests/gobject/Makefile tests/gobject/src/Makefile tests/gobject/docs/Makefile -tests/gobject/docs-tmpl/Makefile tests/bugs/Makefile tests/bugs/src/Makefile tests/bugs/docs/Makefile @@ -319,9 +318,6 @@ test "x$build_tests" != "xno" \ test "x$enable_debug" != "xno" \ && AC_MSG_NOTICE([** Debug tracing enabled]) \ || AC_MSG_NOTICE([ Debug tracing disabled]) -test "x$enable_debug" != "xno" \ - && AC_MSG_NOTICE([** Debug tracing enabled]) \ - || AC_MSG_NOTICE([ Debug tracing disabled]) test "x$have_yelp_tools" != "xno" \ && AC_MSG_NOTICE([** Documentation enabled]) \ || AC_MSG_NOTICE([ Documentation disabled]) diff --git a/devhelp2.xsl b/devhelp2.xsl index 76a20b7..b441df7 100644 --- a/devhelp2.xsl +++ b/devhelp2.xsl @@ -57,7 +57,7 @@ - @@ -90,8 +90,8 @@ - - + + diff --git a/examples/Makefile.am b/examples/Makefile.am index d651f55..471527f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,8 +1,3 @@ -## Process this file with automake to produce Makefile.in - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - # This is a blank Makefile.am for using gtk-doc. # Copy this to your project's API docs directory and modify the variables to # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples @@ -14,8 +9,7 @@ DOC_MODULE= # Uncomment for versioned docs and specify the version of the module, e.g. '2'. #DOC_MODULE_VERSION=2 - -# The top-level XML file (SGML in the past). You can change this if you want to. +# The top-level XML file. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml # Directories containing the source code. @@ -24,25 +18,21 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml # e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk DOC_SOURCE_DIR= -# Extra options to pass to gtkdoc-scangobj. Not normally needed. +# Extra options to pass to gtkdoc-scangobj. Normally not needed. SCANGOBJ_OPTIONS= # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" SCAN_OPTIONS= -# Extra options to supply to gtkdoc-mkdb. +# Extra options to supply to gtkdoc-mkdb # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml MKDB_OPTIONS=--xml-mode --output-format=xml -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - # Extra options to supply to gtkdoc-mkhtml MKHTML_OPTIONS= -# Extra options to supply to gtkdoc-fixref. Not normally needed. +# Extra options to supply to gtkdoc-fixref. Normally not needed. # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html FIXXREF_OPTIONS= @@ -64,13 +54,12 @@ IGNORE_HFILES= # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png HTML_IMAGES= -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml +# Extra files that are included by $(DOC_MAIN_SGML_FILE). +# e.g. content_files=running.xml building.xml changes-2.0.xml content_files= -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml +# Files where gtk-doc abbrevations (#GtkWidget) are expanded +# e.g. expand_content_files=running.xml expand_content_files= # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. @@ -84,22 +73,13 @@ GTKDOC_LIBS= # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += - -# Files not to distribute -# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types -# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt -#DISTCLEANFILES += - # Comment this out if you want 'make check' to test you doc status # and run some sanity checks if ENABLE_GTK_DOC TESTS_ENVIRONMENT = \ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -#TESTS = $(GTKDOC_CHECK) +TESTS = $(GTKDOC_CHECK) endif -include $(top_srcdir)/git.mk diff --git a/gtk-doc.doap b/gtk-doc.doap index b82e99d..f44baab 100644 --- a/gtk-doc.doap +++ b/gtk-doc.doap @@ -17,22 +17,9 @@ used to document application code. - - + + C + Shell diff --git a/gtk-doc.flat.make b/gtk-doc.flat.make index 06e1856..a646595 100644 --- a/gtk-doc.flat.make +++ b/gtk-doc.flat.make @@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -86,7 +87,7 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ destdir=`dirname $(abs_builddir)/$$file` ;\ @@ -120,7 +121,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -185,17 +186,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -217,11 +218,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -246,12 +247,15 @@ clean-local: @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ rm -rf tmpl; \ fi diff --git a/gtk-doc.make b/gtk-doc.make index dd31993..823abb0 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -86,7 +87,7 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ destdir=`dirname $(abs_builddir)/$$file` ;\ @@ -120,7 +121,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -185,17 +186,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -217,11 +218,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -246,12 +247,15 @@ clean-local: @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ rm -rf tmpl; \ fi diff --git a/gtk-doc.notmpl-flat.make b/gtk-doc.notmpl-flat.make index 642020b..fe66061 100644 --- a/gtk-doc.notmpl-flat.make +++ b/gtk-doc.notmpl-flat.make @@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -86,7 +87,7 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ destdir=`dirname $(abs_builddir)/$$file`; \ @@ -118,7 +119,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -162,17 +163,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -194,11 +195,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -223,12 +224,15 @@ clean-local: @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make index e791656..9ccd0b0 100644 --- a/gtk-doc.notmpl.make +++ b/gtk-doc.notmpl.make @@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -86,7 +87,7 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ destdir=`dirname $(abs_builddir)/$$file`; \ @@ -118,7 +119,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -162,17 +163,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -194,11 +195,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -223,12 +224,15 @@ clean-local: @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: diff --git a/gtk-doc.spec b/gtk-doc.spec index ee9bc11..8f15bd8 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -2,7 +2,7 @@ Summary: GTK+ DocBook Documentation Generator Name: gtk-doc -Version: 1.21 +Version: 1.22 Release: 1 License: GPL Group: Utilities/Text diff --git a/gtk-doc.xsl b/gtk-doc.xsl index 3427e0f..992fd9d 100644 --- a/gtk-doc.xsl +++ b/gtk-doc.xsl @@ -30,6 +30,7 @@ part toc reference toc + 1 @@ -334,7 +335,7 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/ --> @@ -399,7 +400,7 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/ - <xsl:apply-templates select="$home" mode="object.title.markup"/>: <xsl:copy-of select="$title"/> + <xsl:copy-of select="$title"/>: <xsl:apply-templates select="$home" mode="object.title.markup"/> @@ -731,28 +732,28 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/ @@ -768,7 +769,7 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/ - use it here --> - + @@ -776,6 +777,21 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/ + + + + + + em-dash + + + + + + idx diff --git a/gtkdoc-common.pl b/gtkdoc-common.pl index ddc7ebd..9b3be13 100644 --- a/gtkdoc-common.pl +++ b/gtkdoc-common.pl @@ -54,7 +54,7 @@ sub UpdateFileIfChanged { if (-e $old_file) { `cmp -s "$old_file" "$new_file"`; $exit_code = $? >> 8; - #LogTrace(" cmp exit code: $exit_code ($?)"; + #LogTrace(" cmp exit code: $exit_code ($?)"); } if ($exit_code > 1) { @@ -277,6 +277,12 @@ sub ParseEnumDeclaration { $declaration =~ s/\([^)\n]+\)//g; + # Remove apostrophed characters (e.g. '}' or ',') values to avoid getting + # confused with end of enumeration. + # See https://bugzilla.gnome.org/show_bug.cgi?id=741305 + + $declaration =~ s/\'.\'//g; + # Remove comma from comma - possible whitespace - closing brace sequence # since it is legal in GNU C and C99 to have a trailing comma but doesn't # result in an actual enum member diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in index 5175473..c6a0403 100644 --- a/gtkdoc-common.pl.in +++ b/gtkdoc-common.pl.in @@ -54,7 +54,7 @@ sub UpdateFileIfChanged { if (-e $old_file) { `cmp -s "$old_file" "$new_file"`; $exit_code = $? >> 8; - #@TRACE@(" cmp exit code: $exit_code ($?)"; + #@TRACE@(" cmp exit code: $exit_code ($?)"); } if ($exit_code > 1) { @@ -277,6 +277,12 @@ sub ParseEnumDeclaration { $declaration =~ s/\([^)\n]+\)//g; + # Remove apostrophed characters (e.g. '}' or ',') values to avoid getting + # confused with end of enumeration. + # See https://bugzilla.gnome.org/show_bug.cgi?id=741305 + + $declaration =~ s/\'.\'//g; + # Remove comma from comma - possible whitespace - closing brace sequence # since it is legal in GNU C and C99 to have a trailing comma but doesn't # result in an actual enum member diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in index 711cd21..83af01b 100644 --- a/gtkdoc-depscan.in +++ b/gtkdoc-depscan.in @@ -14,6 +14,8 @@ default_books = ['atk', 'gdk', 'gdk-pixbuf', 'glib', 'gio', 'gobject', 'gtk', 'p __comment_regex = re.compile(r'/\*.*?\*/', re.DOTALL) __word_regex = re.compile(r'\b[A-Za-z_][A-Za-z0-9_]*\b') +u2a_table = { 0x2018:0x27, 0x2019:0x27, 0x201C:0x22, 0x201D:0x22 } + class Book(object): def __init__(self, name, folders, version=None): self.__catalog = None @@ -181,7 +183,7 @@ class Symbol(object): def from_xml(cls, book, attrs): name, type, link, deprecated, since = map(attrs.get, Symbol.known_attributes) - name = name.strip() + name = name.strip().translate(u2a_table) if name.endswith('()'): if not type in ('function', 'macro'): diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in index de0d35d..6e11e56 100755 --- a/gtkdoc-mkdb.in +++ b/gtkdoc-mkdb.in @@ -37,7 +37,7 @@ require "gtkdoc-common.pl"; # name of documentation module my $MODULE; my $TMPL_DIR; -my $SGML_OUTPUT_DIR; +my $DB_OUTPUT_DIR; my @SOURCE_DIRS; my $SOURCE_SUFFIXES = ""; my $IGNORE_FILES = ""; @@ -57,7 +57,7 @@ my %optctl = ('module' => \$MODULE, 'source-dir' => \@SOURCE_DIRS, 'source-suffixes' => \$SOURCE_SUFFIXES, 'ignore-files' => \$IGNORE_FILES, - 'output-dir' => \$SGML_OUTPUT_DIR, + 'output-dir' => \$DB_OUTPUT_DIR, 'tmpl-dir' => \$TMPL_DIR, 'version' => \$PRINT_VERSION, 'help' => \$PRINT_HELP, @@ -100,8 +100,8 @@ gtkdoc-mkdb version @VERSION@ - generate docbook files --module=MODULE_NAME Name of the doc module being parsed --source-dir=DIRNAME Directories which contain inline reference material --source-suffixes=SUFFIXES Suffixes of source files to scan, comma-separated ---ignore-files=FILES Files or directories which should not be scanned - May be used more than once for multiple directories +--ignore-files=FILES A space-separated list of header files/dirs not to + scan --output-dir=DIRNAME Directory to put the generated DocBook files in --tmpl-dir=DIRNAME Directory in which template files may be found --main-sgml-file=FILE File containing the toplevel DocBook file. @@ -118,6 +118,8 @@ EOF exit 0; } +@TRACE@(" ignore files: [$IGNORE_FILES]\n"); + my ($empty_element_end, $doctype_header); # autodetect output format @@ -138,6 +140,16 @@ if (! defined($OUTPUT_FORMAT) || ($OUTPUT_FORMAT eq "")) { $OUTPUT_FORMAT = lc($OUTPUT_FORMAT); } +if ($OUTPUT_FORMAT eq "sgml") { +print < 1, "envar" => 1, "filename" => 1, "firstterm" => 1, + "footnote" => 1, "function" => 1, "manvolnum" => 1, "option" => 1, "replaceable" => 1, + "structfield" => 1, "structname" => 1, "title" => 1, "varname" => 1 ); @@ -405,9 +420,9 @@ my %MD_GTK_ESCAPABLE_CHARS = ( "@" => 1, "%" => 1 ); # Create the root DocBook output directory if it doens't exist. -if (! -e $SGML_OUTPUT_DIR) { - mkdir ("$SGML_OUTPUT_DIR", 0777) - || die "Can't create directory: $SGML_OUTPUT_DIR"; +if (! -e $DB_OUTPUT_DIR) { + mkdir ("$DB_OUTPUT_DIR", 0777) + || die "Can't create directory: $DB_OUTPUT_DIR"; } # Function and other declaration output settings. @@ -433,9 +448,9 @@ for my $dir (@SOURCE_DIRS) { &ReadSourceDocumentation ($dir); } -my $changed = &OutputSGML ("$ROOT_DIR/$MODULE-sections.txt"); +my $changed = &OutputDB ("$ROOT_DIR/$MODULE-sections.txt"); -# If any of the DocBook SGML files have changed, update the timestamp file (so +# If any of the DocBook files have changed, update the timestamp file (so # it can be used for Makefile dependencies). if ($changed || ! -e "$ROOT_DIR/sgml.stamp") { @@ -515,9 +530,9 @@ sub OutputObjectList { my $cols = 3; # FIXME: use $OUTPUT_FORMAT - # my $old_object_index = "$SGML_OUTPUT_DIR/object_index.$OUTPUT_FORMAT"; - my $old_object_index = "$SGML_OUTPUT_DIR/object_index.sgml"; - my $new_object_index = "$SGML_OUTPUT_DIR/object_index.new"; + # my $old_object_index = "$DB_OUTPUT_DIR/object_index.$OUTPUT_FORMAT"; + my $old_object_index = "$DB_OUTPUT_DIR/object_index.sgml"; + my $new_object_index = "$DB_OUTPUT_DIR/object_index.new"; open (OUTPUT, ">$new_object_index") || die "Can't create $new_object_index: $!"; @@ -585,7 +600,7 @@ sub TrimTextBlock { ############################################################################# -# Function : OutputSGML +# Function : OutputDB # Description : This collects the output for each section of the docs, and # outputs each file when the end of the section is found. # Arguments : $file - the $MODULE-sections.txt file which contains all of @@ -593,7 +608,7 @@ sub TrimTextBlock { # into sections and subsections. ############################################################################# -sub OutputSGML { +sub OutputDB { my ($file) = @_; @TRACE@("Reading: $file\n"); @@ -909,7 +924,7 @@ ${other_synop} EOF } - my $file_changed = &OutputSGMLFile ($filename, $title, $section_id, + my $file_changed = &OutputDBFile ($filename, $title, $section_id, $section_includes, \$functions_synop, \$other_synop, \$functions_details, \$other_details, @@ -1074,8 +1089,8 @@ EOF sub OutputIndex { my ($basename, $apiindexref ) = @_; my %apiindex = %{$apiindexref}; - my $old_index = "$SGML_OUTPUT_DIR/$basename.xml"; - my $new_index = "$SGML_OUTPUT_DIR/$basename.new"; + my $old_index = "$DB_OUTPUT_DIR/$basename.xml"; + my $new_index = "$DB_OUTPUT_DIR/$basename.new"; my $lastletter = " "; my $divopen = 0; my $symbol; @@ -1087,13 +1102,13 @@ sub OutputIndex { my $header = $doctype_header; $header =~ s/\n"); + print (OUTPUT "$header\n"); @TRACE@("generate $basename index (".%apiindex." entries)\n"); # do a case insensitive sort while chopping off the prefix foreach my $hash ( - sort { $$a{criteria} cmp $$b{criteria} } + sort { $$a{criteria} cmp $$b{criteria} or $$a{original} cmp $$b{original} } map { my $x = uc($_); $x =~ s/^$NAME_SPACE\_?(.*)/$1/i; { criteria => $x, original => $_, short => $1 } } keys %apiindex) { @@ -1239,8 +1254,8 @@ sub OutputSinceIndexes { ############################################################################# sub OutputAnnotationGlossary { - my $old_glossary = "$SGML_OUTPUT_DIR/annotation-glossary.xml"; - my $new_glossary = "$SGML_OUTPUT_DIR/annotation-glossary.new"; + my $old_glossary = "$DB_OUTPUT_DIR/annotation-glossary.xml"; + my $new_glossary = "$DB_OUTPUT_DIR/annotation-glossary.new"; my $lastletter = " "; my $divopen = 0; @@ -1411,7 +1426,8 @@ sub OutputSymbolTraits { my $desc = ""; if (exists $Since{$symbol}) { - $desc .= "Since $Since{$symbol}"; + my $link_id = "api-index-".$Since{$symbol}; + $desc .= "Since: $Since{$symbol}"; } if (exists $StabilityLevel{$symbol}) { my $stability = $StabilityLevel{$symbol}; @@ -1578,7 +1594,7 @@ sub OutputTypedef { # Description : Returns the synopsis and detailed description of a struct. # We check if it is a object struct, and if so we only output # parts of it that are noted as public fields. -# We also use a different SGML ID for object structs, since the +# We also use a different IDs for object structs, since the # original ID is used for the entire RefEntry. # Arguments : $symbol - the struct. # $declaration - the declaration of the struct. @@ -1747,7 +1763,6 @@ EOF # trim $field_descr =~ s/^(\s|\n)+//msg; $field_descr =~ s/(\s|\n)+$//msg; - $desc .= "$field_descr\n"; $desc .= "$field_descr\n$param_annotations\n"; delete $field_descrs{$field_name}; } else { @@ -2132,6 +2147,15 @@ sub OutputVariable { if (defined ($SymbolDocs{$symbol})) { $desc .= &ConvertMarkDown($symbol, $SymbolDocs{$symbol}); } + if (defined ($SymbolAnnotations{$symbol})) { + my $param_desc = $SymbolAnnotations{$symbol}; + my $param_annotations = ""; + ($param_desc,$param_annotations) = &ExpandAnnotation($symbol, $param_desc); + if ($param_annotations ne "") { + $desc .= "\n$param_annotations"; + } + } + $desc .= OutputSymbolTraits ($symbol); $desc .= "\n"; return ($synop, $desc); @@ -2223,14 +2247,19 @@ sub OutputFunction { $desc .= &MakeDeprecationNote($symbol); - my $parameters = &OutputParamDescriptions ("FUNCTION", $symbol, @fields); - if (defined ($SymbolDocs{$symbol})) { - my $symbol_docs = &ConvertMarkDown($symbol, $SymbolDocs{$symbol}); - $desc .= $symbol_docs; + $desc .= &ConvertMarkDown($symbol, $SymbolDocs{$symbol}); + } + if (defined ($SymbolAnnotations{$symbol})) { + my $param_desc = $SymbolAnnotations{$symbol}; + my $param_annotations = ""; + ($param_desc,$param_annotations) = &ExpandAnnotation($symbol, $param_desc); + if ($param_annotations ne "") { + $desc .= "\n$param_annotations"; + } } - $desc .= $parameters; + $desc .= &OutputParamDescriptions ("FUNCTION", $symbol, @fields); $desc .= OutputSymbolTraits ($symbol); $desc .= "\n"; return ($synop, $desc); @@ -2273,13 +2302,16 @@ sub OutputParamDescriptions { my $param_desc = $$params[$j + 1]; my $param_annotations = ""; - ($param_desc,$param_annotations) = & ExpandAnnotation($symbol, $param_desc); + ($param_desc,$param_annotations) = &ExpandAnnotation($symbol, $param_desc); $param_desc = &ConvertMarkDown($symbol, $param_desc); # trim $param_desc =~ s/^(\s|\n)+//msg; $param_desc =~ s/(\s|\n)+$//msg; if ($param_name eq "Returns") { - $returns = "$param_desc\n$param_annotations"; + $returns = $param_desc; + if ($param_annotations ne "") { + $returns .= "\n$param_annotations"; + } } elsif ($param_name eq "void") { # FIXME: &LogWarning()? @TRACE@("!!!! void in params for $symbol?\n"); @@ -2391,12 +2423,12 @@ sub ParseStabilityLevel { ############################################################################# -# Function : OutputSGMLFile +# Function : OutputDBFile # Description : Outputs the final DocBook file for one section. # Arguments : $file - the name of the file. # $title - the title from the $MODULE-sections.txt file, which # will be overridden by the title in the template file. -# $section_id - the SGML id to use for the toplevel tag. +# $section_id - the id to use for the toplevel tag. # $includes - comma-separates list of include files added at top of # synopsis, with '<' '>' around them (if not already enclosed in ""). # $functions_synop - reference to the DocBook for the Functions Synopsis part. @@ -2415,10 +2447,10 @@ sub ParseStabilityLevel { # $file_objects - reference to an array of objects in this file ############################################################################# -sub OutputSGMLFile { +sub OutputDBFile { my ($file, $title, $section_id, $includes, $functions_synop, $other_synop, $functions_details, $other_details, $signals_synop, $signals_desc, $args_synop, $args_desc, $hierarchy, $interfaces, $implementations, $prerequisites, $derived, $file_objects) = @_; - @TRACE@("Output sgml for file $file with title '$title'\n"); + @TRACE@("Output docbook for file $file with title '$title'\n"); # The edited title overrides the one from the sections file. my $new_title = $SymbolDocs{"$TMPL_DIR/$file:Title"}; @@ -2513,11 +2545,11 @@ sub OutputSGMLFile { my $extralinks = OutputSectionExtraLinks($title,"Section:$file"); - my $old_sgml_file = "$SGML_OUTPUT_DIR/$file.$OUTPUT_FORMAT"; - my $new_sgml_file = "$SGML_OUTPUT_DIR/$file.$OUTPUT_FORMAT.new"; + my $old_db_file = "$DB_OUTPUT_DIR/$file.$OUTPUT_FORMAT"; + my $new_db_file = "$DB_OUTPUT_DIR/$file.$OUTPUT_FORMAT.new"; - open (OUTPUT, ">$new_sgml_file") - || die "Can't create $new_sgml_file: $!"; + open (OUTPUT, ">$new_db_file") + || die "Can't create $new_db_file: $!"; my $object_anchors = ""; foreach my $object (@$file_objects) { @@ -2527,6 +2559,9 @@ sub OutputSGMLFile { $object_anchors .= "" @@ -2540,9 +2575,7 @@ sub OutputSGMLFile { $title 3 - - \U$MODULE\E Library -$image +\U$MODULE\E Library$image $title @@ -2568,7 +2601,7 @@ $$args_desc$$signals_desc$see_also EOF close (OUTPUT); - return &UpdateFileIfChanged ($old_sgml_file, $new_sgml_file, 0); + return &UpdateFileIfChanged ($old_db_file, $new_db_file, 0); } @@ -2585,8 +2618,8 @@ sub OutputExtraFile { ($basename = $file) =~ s!^.*/!!; - my $old_sgml_file = "$SGML_OUTPUT_DIR/$basename"; - my $new_sgml_file = "$SGML_OUTPUT_DIR/$basename.new"; + my $old_db_file = "$DB_OUTPUT_DIR/$basename"; + my $new_db_file = "$DB_OUTPUT_DIR/$basename.new"; my $contents; @@ -2597,29 +2630,29 @@ sub OutputExtraFile { $contents = ; } - open (OUTPUT, ">$new_sgml_file") - || die "Can't create $new_sgml_file: $!"; + open (OUTPUT, ">$new_db_file") + || die "Can't create $new_db_file: $!"; print OUTPUT &ExpandAbbreviations ("$basename file", $contents); close (OUTPUT); - return &UpdateFileIfChanged ($old_sgml_file, $new_sgml_file, 0); + return &UpdateFileIfChanged ($old_db_file, $new_db_file, 0); } ############################################################################# # Function : OutputBook -# Description : Outputs the SGML entities that need to be included into the -# main SGML file for the module. +# Description : Outputs the entities that need to be included into the +# main docbook file for the module. # Arguments : $book_top - the declarations of the entities, which are added -# at the top of the main SGML file. +# at the top of the main docbook file. # $book_bottom - the references to the entities, which are -# added in the main SGML file at the desired position. +# added in the main docbook file at the desired position. ############################################################################# sub OutputBook { my ($book_top, $book_bottom) = @_; - my $old_file = "$SGML_OUTPUT_DIR/$MODULE-doc.top"; - my $new_file = "$SGML_OUTPUT_DIR/$MODULE-doc.top.new"; + my $old_file = "$DB_OUTPUT_DIR/$MODULE-doc.top"; + my $new_file = "$DB_OUTPUT_DIR/$MODULE-doc.top.new"; open (OUTPUT, ">$new_file") || die "Can't create $new_file: $!"; @@ -2629,8 +2662,8 @@ sub OutputBook { &UpdateFileIfChanged ($old_file, $new_file, 0); - $old_file = "$SGML_OUTPUT_DIR/$MODULE-doc.bottom"; - $new_file = "$SGML_OUTPUT_DIR/$MODULE-doc.bottom.new"; + $old_file = "$DB_OUTPUT_DIR/$MODULE-doc.bottom"; + $new_file = "$DB_OUTPUT_DIR/$MODULE-doc.bottom.new"; open (OUTPUT, ">$new_file") || die "Can't create $new_file: $!"; @@ -2640,7 +2673,7 @@ sub OutputBook { &UpdateFileIfChanged ($old_file, $new_file, 0); - # If the main SGML/XML file hasn't been created yet, we create it here. + # If the main docbook file hasn't been created yet, we create it here. # The user can tweak it later. if ($MAIN_SGML_FILE && ! -e $MAIN_SGML_FILE) { open (OUTPUT, ">$MAIN_SGML_FILE") @@ -2684,8 +2717,17 @@ EOF print OUTPUT < Object Hierarchy - + +EOF + } else { + print OUTPUT < + Object Hierarchy + + + --> EOF } @@ -2698,8 +2740,19 @@ print OUTPUT <Index of deprecated API - +EOF + if (keys(%AnnotationsUsed)) { + print OUTPUT < +EOF + } else { + print OUTPUT < + --> +EOF + } + print OUTPUT < EOF @@ -2818,12 +2871,14 @@ sub ExpandAnnotation { my $param_annotations = ""; # look for annotations at the start of the comment part - if ($param_desc =~ m%^\s*\((.*?)\):%) { + # function level annotations don't end with a colon ':' + if ($param_desc =~ m%^\s*\((.*?)\)(:|$)%) { my @annotations; my $annotation; $param_desc = $'; @annotations = split(/\)\s*\(/,$1); + @TRACE@("annotations for $symbol: '$1'\n"); foreach $annotation (@annotations) { # need to search for the longest key-match in %AnnotationDefinition my $match_length=0; @@ -3282,26 +3337,30 @@ sub GetHierarchy { my $last_index = 0; $level = 1; for ($i = $#ancestors; $i >= 0; $i--) { - my $link_text; + my $entry_text; + my $alt_text; + my $ancestor = $ancestors[$i]; + my $ancestor_id = &CreateValidSGMLID ($ancestor); + my $indent = ' ' x ($level * 4); # Don't add a link to the current object, i.e. when i == 0. if ($i > 0) { - my $ancestor_id = &CreateValidSGMLID ($ancestors[$i]); - $link_text = "$ancestors[$i]"; + $entry_text = $indent . "$ancestor"; + $alt_text = $indent . $ancestor; } else { - $link_text = "$ancestors[$i]"; + $entry_text = $indent . $ancestor; + $alt_text = $indent . "$ancestor"; } - my $indented_text = ' ' x ($level * 4) . $link_text; + @TRACE@("Checking for '$entry_text' or '$alt_text'"); # Check if we already have this object my $index = -1; for ($j = 0; $j <= $#hierarchy; $j++) { - if ($hierarchy[$j] eq $indented_text) { + if (($hierarchy[$j] eq $entry_text) or ($hierarchy[$j] eq $alt_text)) { $index = $j; last; } } if ($index == -1) { # We have a new entry, find insert position in alphabetical order - my $indent = ' ' x ($level * 4); my $found = 0; for ($j = $last_index; $j <= $#hierarchy; $j++) { if ($hierarchy[$j] !~ m/^${indent}/) { @@ -3310,24 +3369,29 @@ sub GetHierarchy { last; } elsif ($hierarchy[$j] =~ m/^${indent}[^ ]/) { my $stripped_text = $hierarchy[$j]; - if ($indented_text !~ m/%%; $stripped_text =~ s%%%; } - if ($indented_text lt $stripped_text) { + if ($entry_text lt $stripped_text) { $last_index = $j; $found = 1; last; } } } + # Append to bottom if (!$found) { $last_index = 1 + $#hierarchy; } - splice @hierarchy, $last_index, 0, ($indented_text); + splice @hierarchy, $last_index, 0, ($entry_text); $last_index++; } else { - # Already have this one, remmeber index as base insert point + # Already have this one, make sure we use the not linked version + if ($entry_text !~ m/"; $AllDocumentedSymbols{$symbol} = 1; } else { # FIXME: print a warning? @TRACE@(".. no description\n"); } - $blurb = "" . &CreateValidSGML ($ArgBlurbs[$i]) . ""; } my $pad1 = " " x (24 - length ($name)); @@ -3765,6 +3837,14 @@ sub GetArgs { $arg_desc .= " “$name”$pad1 $type_output\n"; $arg_desc .= $blurb; + if (defined ($SymbolAnnotations{$symbol})) { + my $param_desc = $SymbolAnnotations{$symbol}; + my $param_annotations = ""; + ($param_desc,$param_annotations) = &ExpandAnnotation($symbol, $param_desc); + if ($param_annotations ne "") { + $arg_desc .= "\n$param_annotations"; + } + } $arg_desc .= &MakeDeprecationNote($symbol); if ($flags_string) { @@ -3823,6 +3903,8 @@ sub ReadSourceDocumentation { if ($source_dir =~ m%^\Q$dir\E/(.*)$% and $IGNORE_FILES =~ m/(\s|^)\Q$1\E(\s|$)/) { @TRACE@("Skipping source directory: $source_dir"); return; + } else { + @TRACE@("No match for: ".($1 || $source_dir)); } } @@ -3944,7 +4026,7 @@ sub ScanSourceFile { push (@params, "Returns"); push (@params, $return_desc); } - # Convert special SGML characters + # Convert special characters $description = &ConvertSGMLChars ($symbol, $description); my $k; for ($k = 1; $k <= $#params; $k += $PARAM_FIELD_COUNT) { @@ -4002,7 +4084,7 @@ sub ScanSourceFile { #} $SourceSymbolSourceFile{$symbol} = $file; $SourceSymbolSourceLine{$symbol} = $.; - } + } if ($since_desc) { ($since_desc, my @extra_lines) = split ("\n", $since_desc); @@ -4051,9 +4133,17 @@ sub ScanSourceFile { if (m%^\s*(SECTION:\s*\S+)%) { $symbol = $1; @TRACE@("SECTION DOCS found in source for : '$symbol'\n"); - } elsif (m%^\s*([\w:-]*\w)\s*:?\s*(\([-a-z0-9_ ]+\)\s*)*$%) { + } elsif (m%^\s*([\w:-]*\w)\s*:?\s*(\([-A-Za-z0-9._() ]+?\)\s*)*$%) { $symbol = $1; + my $annotation = $2; @TRACE@("SYMBOL DOCS found in source for : '$symbol'\n"); + if (defined($annotation)) { + chomp($annotation); + if ($annotation ne "") { + $SymbolAnnotations{$symbol} = $annotation; + @TRACE@("remaining text for $symbol: '$annotation'\n"); + } + } } next; } @@ -4072,14 +4162,14 @@ sub ScanSourceFile { } } elsif (m%^\s*since:%i) { # we're in param section and have not seen the blank line - if($in_part ne "") { + if($in_part ne "param") { $since_desc = $'; $in_part = "since"; next; } } elsif (m%^\s*deprecated:%i) { # we're in param section and have not seen the blank line - if($in_part ne "") { + if($in_part ne "param") { $deprecated_desc = $'; $in_part = "deprecated"; next; @@ -4128,13 +4218,20 @@ sub ScanSourceFile { push (@params, $param_name); push (@params, $param_desc); $current_param += $PARAM_FIELD_COUNT; + $in_part = "param"; + next; + } elsif ($in_part eq "") { + @TRACE@("continuation for $symbol annotation '$_'"); + my $annotation = $_; + $annotation =~ s/^\s+|\s+$//g ; + $SymbolAnnotations{$symbol} .= $annotation; next; } # We must be in the middle of a parameter description, so add it on # to the last element in @params. if ($current_param == -1) { - &LogWarning ($file, $., "Parsing comment block file : parameter expected."); + &LogWarning ($file, $., "Parsing comment block file : parameter expected, but got '$_'"); } else { $params[$#params] .= $_; } @@ -4697,6 +4794,8 @@ sub MarkDownParseBlocks { my $first_char = substr ($line, 0, 1); my $deindented_line; + @TRACE@("in '".$md_block->{"type"}."' state, parsing '$line'"); + if ($md_block->{"type"} eq "markup") { if (!$md_block->{"closed"}) { if (index ($line, $md_block->{"start"}) != -1) { @@ -4706,7 +4805,9 @@ sub MarkDownParseBlocks { if ($md_block->{"depth"} > 0) { $md_block->{"depth"}--; } else { + @TRACE@("closing tag '$line'"); $md_block->{"closed"} = 1; + # TODO(ensonic): reparse inner text with MarkDownParseLines? } } $md_block->{"text"} .= "\n" . $line; @@ -4844,6 +4945,7 @@ sub MarkDownParseBlocks { } # indentation sensitive types + @TRACE@("parsing '$line'"); if ($line =~ /^([#]{1,2})[ \t]+(.+?)[ \t]*[#]*[ \t]*(?:{#([^}]+)})?[ \t]*$/) { # atx heading (#) @@ -4905,16 +5007,18 @@ sub MarkDownParseBlocks { my $is_self_closing = defined($2); # FIXME: why do we need to skip https? here, if we generalize this to all # uri schemes we get parsing errors - if (! $MD_TEXT_LEVEL_ELEMENTS{$tag} && $tag !~ /^https?/) { + if (! $MD_TEXT_LEVEL_ELEMENTS{$tag} && $tag !~ /^https?/ && !defined($md_block->{"start"})) { push @md_blocks, $md_block; if ($is_self_closing) { + @TRACE@("self-closing docbook '$tag'"); $md_block = { type => "self-closing tag", text => $deindented_line }; $is_self_closing = 0; next OUTER; } + @TRACE@("new markup '$tag'"); $md_block = { type => "markup", text => $deindented_line, start => "<" . $tag . ">", @@ -4925,6 +5029,18 @@ sub MarkDownParseBlocks { $md_block->{"closed"} = 1; } next OUTER; + } else { + @TRACE@("text level docbook '$tag'"); + if (!defined($md_block->{"start"}) && $MD_TEXT_LEVEL_ELEMENTS{$tag}) { + $md_block->{"start"} = "<" . $tag . ">"; + $md_block->{"end"} = ""; + $md_block->{"closed"} = 0; + @TRACE@("scanning for end of '$tag'"); + } + if (defined($md_block->{"start"}) && $deindented_line =~ /$md_block->{"end"}/) { + $md_block->{"closed"} = 1; + @TRACE@("found end of '$tag'"); + } } } elsif ($line =~ /^([ ]*)[*+-][ ](.*)/) { # li @@ -5236,19 +5352,7 @@ sub ReplaceEntities { # Expand entities in even inside CDATA since # we changed the definition of |[ to add CDATA for ($i = 0; $i <= $#entities; $i++) { - if ($text =~ s/$entities[$i][0]/$entities[$i][1]/g) { - # don't warn about * since it is expected to be present - # for C-style comments - if ($entities[$i][0] ne "*") { - $warn .= "$entities[$i][0] "; - } - } - } - - if ($warn ne "") { - chomp $warn; - &LogWarning (&GetSymbolSourceFile ($symbol), &GetSymbolSourceLine($symbol), - "Deprecated entities found in documentation for $symbol: $warn"); + $text =~ s/$entities[$i][0]/$entities[$i][1]/g; } return $text; @@ -5438,7 +5542,7 @@ sub ReadDeclarationsFile { # If the declaration is an empty typedef struct _XXX XXX # set the flag to indicate the struct has a typedef. - if ($declaration_type eq 'STRUCT' + if (($declaration_type eq 'STRUCT' || $declaration_type eq 'UNION') && $declaration =~ m/^\s*$/) { @TRACE@("Struct has typedef: $declaration_name\n"); $StructHasTypedef{$declaration_name} = 1; @@ -5460,13 +5564,13 @@ sub ReadDeclarationsFile { eq $declaration_type) { # If the existing declaration is empty, or is just a # forward declaration of a struct, override it. - if ($declaration_type eq 'STRUCT') { - if ($Declarations{$declaration_name} =~ m/^\s*(struct\s+\w+\s*;)?\s*$/) { + if ($declaration_type eq 'STRUCT' || $declaration_type eq 'UNION') { + if ($Declarations{$declaration_name} =~ m/^\s*((struct|union)\s+\w+\s*;)?\s*$/) { if ($is_deprecated) { $Deprecated{$declaration_name} = ""; } $Declarations{$declaration_name} = $declaration; - } elsif ($declaration =~ m/^\s*(struct\s+\w+\s*;)?\s*$/) { + } elsif ($declaration =~ m/^\s*((struct|union)\s+\w+\s*;)?\s*$/) { # Ignore an empty or forward declaration. } else { &LogWarning ($file, $., "Structure $declaration_name has multiple definitions."); @@ -5836,9 +5940,9 @@ sub ReadObjectHierarchy { close (INPUT); # FIXME: use $OUTPUT_FORMAT - # my $old_tree_index = "$SGML_OUTPUT_DIR/tree_index.$OUTPUT_FORMAT"; - my $old_tree_index = "$SGML_OUTPUT_DIR/tree_index.sgml"; - my $new_tree_index = "$SGML_OUTPUT_DIR/tree_index.new"; + # my $old_tree_index = "$DB_OUTPUT_DIR/tree_index.$OUTPUT_FORMAT"; + my $old_tree_index = "$DB_OUTPUT_DIR/tree_index.sgml"; + my $new_tree_index = "$DB_OUTPUT_DIR/tree_index.new"; open (OUTPUT, ">$new_tree_index") || die "Can't create $new_tree_index: $!"; @@ -5889,6 +5993,9 @@ sub ReadInterfaces { } $Interfaces{$object} = join(' ', @knownIfaces); + @TRACE@("Interfaces for $object: $Interfaces{$object}\n"); + } else { + @TRACE@("skipping interfaces for unknown symbol: $object\n"); } } close (INPUT); diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in index 13256fc..5f171be 100644 --- a/gtkdoc-mkhtml.in +++ b/gtkdoc-mkhtml.in @@ -102,6 +102,14 @@ if $is_xml; then --stringparam chunker.output.quiet $quiet \ "$@" $gtkdocdir/gtk-doc.xsl $document || exit $? else + echo <&2 + cleanexit 1 fi fi else diff --git a/gtkdoc-mktmpl.in b/gtkdoc-mktmpl.in index 72ada86..c64dfd3 100755 --- a/gtkdoc-mktmpl.in +++ b/gtkdoc-mktmpl.in @@ -98,6 +98,14 @@ EOF exit 0; } +print <\n$symbol\n$deprecated$decl\n"; } + # G_DECLARE_* + + } elsif (m/.*G_DECLARE_(FINAL_TYPE|DERIVABLE_TYPE|INTERFACE)\s*\(/) { + $in_declaration = "g-declare"; + $symbol = "G_DECLARE_$1"; + $decl = $'; # FUNCTIONS @@ -747,10 +753,28 @@ sub ScanHeader { # print "$in_declaration = $decl\n"; #} + if ($in_declaration eq "g-declare") { + if ($decl =~ s/\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\).*$//) { + my $ModuleObjName = $1; + my $module_obj_name = $2; + if ($REBUILD_TYPES) { + push (@get_types, "${module_obj_name}_get_type"); + } + $forward_decls{$ModuleObjName} = "\n$ModuleObjName\n$deprecated\n"; + if ($symbol =~ /^G_DECLARE_DERIVABLE/) { + $forward_decls{"${ModuleObjName}Class"} = "\n${ModuleObjName}Class\n$deprecated\n"; + } + if ($symbol =~ /^G_DECLARE_INTERFACE/) { + $forward_decls{"${ModuleObjName}Interface"} = "\n${ModuleObjName}Interface\n$deprecated\n"; + } + $in_declaration = ""; + } + } + # Note that sometimes functions end in ') G_GNUC_PRINTF (2, 3);' or # ') __attribute__ (...);'. if ($in_declaration eq 'function') { - if ($decl =~ s/\)\s*(G_GNUC_.*|.*DEPRECATED.*|${IGNORE_DECORATORS}\s*|__attribute__\s*\(.*\)\s*)?;.*$//) { + if ($decl =~ s/\)\s*(G_GNUC_.*|.*DEPRECATED.*|${IGNORE_DECORATORS}\s*|__attribute__\s*\(.*\)\s*)*;.*$//s) { if ($internal == 0) { $decl =~ s%/\*.*?\*/%%gs; # remove comments. #$decl =~ s/^\s+//; # remove leading whitespace. @@ -762,7 +786,7 @@ sub ScanHeader { print DECL "\n$symbol\n$deprecated$ret_type\n$decl\n\n"; if ($REBUILD_TYPES) { # check if this looks like a get_type function and if so remember - if (($symbol =~ m/_get_type$/) && ($ret_type =~ m/GType/) && ($decl =~ m/(void|)/)) { + if (($symbol =~ m/_get_type$/) && ($ret_type =~ m/GType/) && ($decl =~ m/^(void|)$/)) { @TRACE@("Adding get-type: [$ret_type] [$symbol] [$decl]\tfrom $input_file"); push (@get_types, $symbol); } diff --git a/gtkdocize.in b/gtkdocize.in index 06b67a5..718c642 100644 --- a/gtkdocize.in +++ b/gtkdocize.in @@ -13,7 +13,7 @@ datadir=@datadir@ # options copy=no makefile=gtk-doc.make -flavour=legacy +flavour=no-tmpl # mini help usage="\ @@ -146,7 +146,7 @@ fi # matches the the automake fragment. # If AC_CONFIG_MACRO_DIR is not used, the macro won't be copied, and # the correct flags must be passed to aclocal for it to find the macro. -m4dir="$srcdir/`cat "$configure" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`" +m4dir="$srcdir"/`autoconf 2>/dev/null --trace 'AC_CONFIG_MACRO_DIR:$1' "$configure"` if test -n "$m4dir"; then rm -f $m4dir/gtk-doc.m4 if test "$copy" = yes; then diff --git a/help/Makefile.in b/help/Makefile.in index 46938e9..2786d24 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = help -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,26 +90,58 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = manual @@ -186,6 +262,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -285,22 +363,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -315,57 +396,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -381,12 +417,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +429,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +442,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -451,13 +493,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -578,22 +617,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff --git a/help/manual/C/fdl-appendix.xml b/help/manual/C/fdl-appendix.xml index b07c6c2..d36c0bc 100644 --- a/help/manual/C/fdl-appendix.xml +++ b/help/manual/C/fdl-appendix.xml @@ -526,7 +526,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/C/index.docbook b/help/manual/C/index.docbook index c689d59..860e561 100644 --- a/help/manual/C/index.docbook +++ b/help/manual/C/index.docbook @@ -80,6 +80,12 @@ + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 @@ -572,12 +578,17 @@ make Integration with version control systems - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -595,9 +606,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -642,7 +653,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -775,12 +795,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -831,16 +856,16 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - As already mentioned earlier GTK-Doc is for documenting public API. Thus - one cannot write documentation for static symbols. Nevertheless it is good - to comment those symbols too. This helps other to understand you code. - Therefore we recommend to comment these using normal comments (without the - 2nd '*' in the first line). - If later the function needs to be made public, all one needs to do is to - add another '*' in the comment block and insert the symbol name at the - right place inside the sections file. - + + As already mentioned earlier GTK-Doc is for documenting public API. Thus + one cannot write documentation for static symbols. Nevertheless it is good + to comment those symbols too. This helps other to understand you code. + Therefore we recommend to comment these using normal comments (without the + 2nd '*' in the first line). + If later the function needs to be made public, all one needs to do is to + add another '*' in the comment block and insert the symbol name at the + right place inside the sections file. + @@ -1042,10 +1067,10 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - (FIXME : Stability information) - - + + (FIXME : Stability information) + + General tags + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Function comment block @@ -1096,13 +1153,6 @@ foo_get_bar(Foo *foo) private. They are treated like static functions. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - Function comment block tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1887,7 +1939,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. diff --git a/help/manual/Makefile.am b/help/manual/Makefile.am index b5a7480..ae8af76 100644 --- a/help/manual/Makefile.am +++ b/help/manual/Makefile.am @@ -8,7 +8,7 @@ HELP_FILES = \ index.docbook \ fdl-appendix.xml -HELP_LINGUAS = bn_IN de el en_GB es fr gu pt_BR sl sv ta te zh_CN +HELP_LINGUAS = bn_IN de el en_GB es fr gl gu pt_BR sl sv ta te zh_CN CLEANFILES = $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) diff --git a/help/manual/Makefile.in b/help/manual/Makefile.in index 8463c4b..be4ec5d 100644 --- a/help/manual/Makefile.in +++ b/help/manual/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = help/manual -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,14 +90,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -146,6 +202,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -208,7 +266,7 @@ HELP_FILES = \ index.docbook \ fdl-appendix.xml -HELP_LINGUAS = bn_IN de el en_GB es fr gu pt_BR sl sv ta te zh_CN +HELP_LINGUAS = bn_IN de el en_GB es fr gl gu pt_BR sl sv ta te zh_CN CLEANFILES = $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) all: all-am @@ -249,11 +307,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -390,15 +448,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am @HAVE_YELP_TOOLS_TRUE@@YELP_HELP_RULES@ diff --git a/help/manual/bn_IN/fdl-appendix.xml b/help/manual/bn_IN/fdl-appendix.xml index 7cf0fc3..8589225 100644 --- a/help/manual/bn_IN/fdl-appendix.xml +++ b/help/manual/bn_IN/fdl-appendix.xml @@ -496,7 +496,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/bn_IN/index.docbook b/help/manual/bn_IN/index.docbook index e8bb9e2..a208296 100644 --- a/help/manual/bn_IN/index.docbook +++ b/help/manual/bn_IN/index.docbook @@ -81,11 +81,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -546,12 +552,17 @@ make ভার্সান কনট্রোল সিস্টেমের সাথে একত্রিত করার প্রণালী - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -569,9 +580,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -616,7 +627,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -743,12 +763,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -799,16 +824,16 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - As already mentioned earlier GTK-Doc is for documenting public API. Thus - one cannot write documentation for static symbols. Nevertheless it is good - to comment those symbols too. This helps other to understand you code. - Therefore we recommend to comment these using normal comments (without the - 2nd '*' in the first line). - If later the function needs to be made public, all one needs to do is to - add another '*' in the comment block and insert the symbol name at the - right place inside the sections file. - + + As already mentioned earlier GTK-Doc is for documenting public API. Thus + one cannot write documentation for static symbols. Nevertheless it is good + to comment those symbols too. This helps other to understand you code. + Therefore we recommend to comment these using normal comments (without the + 2nd '*' in the first line). + If later the function needs to be made public, all one needs to do is to + add another '*' in the comment block and insert the symbol name at the + right place inside the sections file. + @@ -1002,8 +1027,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : স্থায়ীত্ব সংক্রান্ত তথ্য) - + (FIXME : স্থায়ীত্ব সংক্রান্ত তথ্য) + সাধারণ ট্যাগ + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + ফাংশান কমেন্টের ব্লক @@ -1054,13 +1111,6 @@ foo_get_bar(Foo *foo) private. They are treated like static functions. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - ফাংশান কমেন্টের ব্লক tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1840,7 +1892,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2383,7 +2435,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/de/fdl-appendix.xml b/help/manual/de/fdl-appendix.xml index 200024b..e9c7213 100644 --- a/help/manual/de/fdl-appendix.xml +++ b/help/manual/de/fdl-appendix.xml @@ -192,7 +192,13 @@ 6. SAMMLUNGEN VON DOKUMENTEN Sie dürfen eine Sammlung erstellen, die aus dem Dokument und anderen, unter dieser Lizenz veröffentlichten Dokumenten besteht, und die individuellen Kopien der Lizenz in den einzelnen Dokumenten durch eine einzige Kopie ersetzen, die sich in der Sammlung befindet, vorausgesetzt, Sie folgen den Regeln dieser Lizenz für wortwörtliches Kopieren jedes dieser Dokumente in jeglicher Hinsicht. - Sie dürfen ein einzelnes Dokument aus einer solchen Sammlung heraustrennen, und es individuell unter dieser Lizenz verteilen, vorausgesetzt, Sie fügen eine Kopie dieser Lizenz in das herausgetrennte Dokument ein und folgen der Lizenz in jeglicher Hinsicht bezüglich dem wortwörtlichen Kopieren des Dokuments. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/de/index.docbook b/help/manual/de/index.docbook index 4df1280..51d9277 100644 --- a/help/manual/de/index.docbook +++ b/help/manual/de/index.docbook @@ -46,11 +46,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -331,7 +337,19 @@ make Integration in Versionsverwaltungssysteme - Als Faustregel gilt, dass alle von Ihnen bearbeiteten Dateien auch unter Versionsverwaltung stehen sollten. In typischen Projekten sind das folgende Dateien: <package>.types, <package>-docs..xml (früher .sgml), <package>-sections.txt, Makefile.am. + + As a rule of thumb, it's the files you edit which should go under + version control. For typical projects it's these files: + <package>.types, + <package>-docs.xml (in the past .sgml), + <package>-sections.txt, + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. + @@ -344,9 +362,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -379,6 +397,15 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html ]]> + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -450,12 +477,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -506,7 +538,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - Wie an früherer Stelle bereits erwähnt, ist GTK-Doc für das Dokumentieren der öffentlichen API gedacht. Daher kann man keine Dokumentation für statische Symbole schreiben. Nichtsdestotrotz ist es jedoch gut, diese Symbole trotzdem zu dokumentieren. Dies hilft anderen, Ihren Code besser zu verstehen. Deswegen empfehlen wir, hierfür normale Kommentare zu verwenden, ohne das zweite »*« in der ersten Zeile. Falls später die Funktion veröffentlicht werden soll, ist es lediglich nötig, im Kommentarblock ein zweites »*« hinzuzufügen und den Symbolnamen an der richtigen Stelle in die Abschnittsdatei einzubauen. + Wie an früherer Stelle bereits erwähnt, ist GTK-Doc für das Dokumentieren der öffentlichen API gedacht. Daher kann man keine Dokumentation für statische Symbole schreiben. Nichtsdestotrotz ist es jedoch gut, diese Symbole trotzdem zu dokumentieren. Dies hilft anderen, Ihren Code besser zu verstehen. Deswegen empfehlen wir, hierfür normale Kommentare zu verwenden, ohne das zweite »*« in der ersten Zeile. Falls später die Funktion veröffentlicht werden soll, ist es lediglich nötig, im Kommentarblock ein zweites »*« hinzuzufügen und den Symbolnamen an der richtigen Stelle in die Abschnittsdatei einzubauen. @@ -626,8 +658,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : Stabilitätsinformation) - + (FIXME : Stabilitätsinformation) + Allgemeine Markierungen + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Kommentarblock einer Funktion Bitte denken Sie an: @@ -665,8 +729,6 @@ foo_get_bar(Foo *foo) GTK-Doc nimmt an, dass alle Symbole (Makros, Funktionen), die mit »_« beginnen, privat sind. Sie werden wie statische Funktionen behandelt. - Werfen Sie auch einen Blick auf die »GObject introspection annotation tags«: http://live.gnome.org/GObjectIntrospection/Annotations - Kommentarblock einer Funktion tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1231,7 +1295,13 @@ EXTRA_DIST += meep.xml Ein Typ fehlt in der Klassenhierarchie. - Wenn der Typ in <package>.hierarchy gelistet ist, aber nicht in xml/tree_index.sgml, dann prüfen Sie sorgfältig, ob der Typ ordnungsgemäß in <package>-sections.txt abgelegt ist. Falls die Typ-Instanz (z.B. GtkWidget) nicht aufgelistet oder versehentlich als privat markiert ist, so wird sie nciht angezeigt. + + If the type is listed in <package>.hierarchy + but not in xml/tree_index.sgml then double check + that the type is correctly placed in the <package>-sections.txt. + If the type instance (e.g. GtkWidget) is not listed or + incidentally marked private it will not be shown. + Ich erhalte foldoc-Verweise für alle gobjekt-Anmerkungen. @@ -1457,7 +1527,13 @@ EXTRA_DIST += meep.xml 6. SAMMLUNGEN VON DOKUMENTEN Sie dürfen eine Sammlung erstellen, die aus dem Dokument und anderen, unter dieser Lizenz veröffentlichten Dokumenten besteht, und die individuellen Kopien der Lizenz in den einzelnen Dokumenten durch eine einzige Kopie ersetzen, die sich in der Sammlung befindet, vorausgesetzt, Sie folgen den Regeln dieser Lizenz für wortwörtliches Kopieren jedes dieser Dokumente in jeglicher Hinsicht. - Sie dürfen ein einzelnes Dokument aus einer solchen Sammlung heraustrennen, und es individuell unter dieser Lizenz verteilen, vorausgesetzt, Sie fügen eine Kopie dieser Lizenz in das herausgetrennte Dokument ein und folgen der Lizenz in jeglicher Hinsicht bezüglich dem wortwörtlichen Kopieren des Dokuments. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/el/el.po b/help/manual/el/el.po index e292795..927dbb6 100644 --- a/help/manual/el/el.po +++ b/help/manual/el/el.po @@ -4,28 +4,32 @@ # Marios Zindilis , 2010. # Tsivikis Vasilis , 2010. # Dimitris Spingos (Δημήτρης Σπίγγος) , 2013, 2014. +# Efstathios Iosifidis , 2015. +# msgid "" msgstr "" "Project-Id-Version: gtk-doc-help.master\n" -"POT-Creation-Date: 2014-04-06 09:24+0000\n" -"PO-Revision-Date: 2014-04-06 19:02+0300\n" -"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" -"Language-Team: team@lists.gnome.gr\n" +"POT-Creation-Date: 2015-04-02 19:14+0000\n" +"PO-Revision-Date: 2015-04-13 14:22+0200\n" +"Last-Translator: Tom Tryfonidis \n" +"Language-Team: Greek, Modern (1453-) \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.0\n" +"X-Generator: Poedit 1.7.5\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" msgstr "" +"Ελληνική μεταφραστική ομάδα GNOME , 2009-2014\n" "Τζένη Πετούμενου , 2009\n" "Θάνος Τρυφωνίδης , 2012\n" "Δημήτρης Σπίγγος , 2013, 2014\n" -"Μαρία Θουκυδίδου , 2014" +"Μαρία Θουκυδίδου , 2014\n" +"Μαρία Μαυρίδου , 2014" #. (itstool) path: bookinfo/title #: C/index.docbook:12 @@ -127,34 +131,45 @@ msgstr "" #. (itstool) path: revhistory/revision #: C/index.docbook:83 msgid "" -"1.20.1 16 Feb 2014 ss1.21.1 18 Jul 2014 ss development version" msgstr "" -"1.20.1 16 Φεβ. 2014 ss1.21.1 18 Ιουλ 2014 ss έκδοση ανάπτυξης" #. (itstool) path: revhistory/revision #: C/index.docbook:89 msgid "" +"1.21 17 Jul 2014 ss bug fixes, dropping deprecated features" +msgstr "" +"1.21 17 Ιουλ 2013 ss διορθώσεις σφαλμάτων, απόρριψη παρωχημένων " +"λειτουργιών" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:95 +msgid "" "1.20 16 Feb 2014 ss bug fixes, markdown support, style improvements" msgstr "" "1.20 16 Φεβ 2014 ss διορθώσεις σφαλμάτων,, υποστήριξη markdown, και " -"βελτιώσεις τεχνοτροπιών" +"authorinitials> διορθώσεις σφαλμάτων, υποστήριξη markdown, και " +"βελτιώσεις στυλ" #. (itstool) path: revhistory/revision -#: C/index.docbook:95 +#: C/index.docbook:101 msgid "" "1.19 05 Jun 2013 ss bug fixes" msgstr "" "1.19 05 Ιουν 2013 ss διόρθωση σφάλματος" +"authorinitials> διόρθωση σφαλμάτων" #. (itstool) path: revhistory/revision -#: C/index.docbook:101 +#: C/index.docbook:107 msgid "" "1.18 14 Sep 2011 ss bug fixes, speedups, markdown support" @@ -164,16 +179,16 @@ msgstr "" "markdown" #. (itstool) path: revhistory/revision -#: C/index.docbook:107 +#: C/index.docbook:113 msgid "" "1.17 26 Feb 2011 sk urgent bug fix update" msgstr "" "1.17 26 Φεβ 2011 sk διόρθωση σφάλματος" +"authorinitials> επείγουσα διόρθωση σφάλματος" #. (itstool) path: revhistory/revision -#: C/index.docbook:113 +#: C/index.docbook:119 msgid "" "1.16 14 Jan 2011 sk bugfixes, layout improvements" @@ -183,7 +198,7 @@ msgstr "" "revremark>" #. (itstool) path: revhistory/revision -#: C/index.docbook:119 +#: C/index.docbook:125 msgid "" "1.15 21 May 2010 sk bug and regression fixes" @@ -192,7 +207,7 @@ msgstr "" "authorinitials> διορθώσεις σφαλμάτων και αναδρομής" #. (itstool) path: revhistory/revision -#: C/index.docbook:125 +#: C/index.docbook:131 msgid "" "1.14 28 March 2010 sk bugfixes and performance improvements" @@ -202,7 +217,7 @@ msgstr "" "revremark>" #. (itstool) path: revhistory/revision -#: C/index.docbook:131 +#: C/index.docbook:137 msgid "" "1.13 18 December 2009 " "sk broken tarball update" #. (itstool) path: revhistory/revision -#: C/index.docbook:137 +#: C/index.docbook:143 msgid "" "1.12 18 December 2009 " "sk new tool features and " @@ -224,7 +239,7 @@ msgstr "" "και διορθώσεις σφαλμάτων" #. (itstool) path: revhistory/revision -#: C/index.docbook:143 +#: C/index.docbook:149 msgid "" "1.11 16 November 2008 " "mal GNOME doc-utils migration" #. (itstool) path: chapter/title -#: C/index.docbook:156 +#: C/index.docbook:162 msgid "Introduction" msgstr "Εισαγωγή" #. (itstool) path: chapter/para -#: C/index.docbook:158 +#: C/index.docbook:164 msgid "" "This chapter introduces GTK-Doc and gives an overview of what it is and how " "it is used." @@ -249,12 +264,12 @@ msgstr "" "και τον τρόπο χρήσης του." #. (itstool) path: sect1/title -#: C/index.docbook:164 +#: C/index.docbook:170 msgid "What is GTK-Doc?" msgstr "Τι είναι το GTK-Doc;" #. (itstool) path: sect1/para -#: C/index.docbook:166 +#: C/index.docbook:172 msgid "" "GTK-Doc is used to document C code. It is typically used to document the " "public API of libraries, such as the GTK+ and GNOME libraries. But it can " @@ -266,12 +281,12 @@ msgstr "" "εφαρμογών." #. (itstool) path: sect1/title -#: C/index.docbook:174 +#: C/index.docbook:180 msgid "How Does GTK-Doc Work?" msgstr "Πώς λειτουργεί το GTK-Doc;" #. (itstool) path: sect1/para -#: C/index.docbook:176 +#: C/index.docbook:182 msgid "" "GTK-Doc works by using documentation of functions placed inside the source " "files in specially-formatted comment blocks, or documentation added to the " @@ -287,21 +302,21 @@ msgstr "" "συναρτήσεις)." #. (itstool) path: sect1/para -#: C/index.docbook:183 +#: C/index.docbook:189 msgid "" "GTK-Doc consists of a number of perl scripts, each performing a different " "step in the process." msgstr "" -"Το GTK-Doc αποτελείται από μια σειρά σεναρίων perl , καθένα από τα οποία " -"είναι υπεύθυνο για διαφορετικό στάδιο της όλης διαδικασίας." +"Το GTK-Doc αποτελείται από μια σειρά δέσμης ενεργειών perl, καθένα από τα " +"οποία είναι υπεύθυνο για διαφορετικό στάδιο της όλης διαδικασίας." #. (itstool) path: sect1/para -#: C/index.docbook:188 +#: C/index.docbook:194 msgid "There are 5 main steps in the process:" msgstr "Η διαδικασία περιλαμβάνει 5 κύρια στάδια:" #. (itstool) path: listitem/para -#: C/index.docbook:195 +#: C/index.docbook:201 msgid "" "Writing the documentation. The author fills in the " "source files with the documentation for each function, macro, union etc. (In " @@ -314,7 +329,7 @@ msgstr "" "παράγονταν αυτόματα, αλλά αυτός ο τρόπος δεν συνιστάται πλέον.)" #. (itstool) path: listitem/para -#: C/index.docbook:205 +#: C/index.docbook:211 msgid "" "Gathering information about the code. " "gtkdoc-scan scans the header files of the code " @@ -350,7 +365,7 @@ msgstr "" "<module>-overrides.txt." #. (itstool) path: listitem/para -#: C/index.docbook:222 +#: C/index.docbook:228 msgid "" "gtkdoc-scangobj can also be used to dynamically " "query a library about any GObject subclasses it exports. It saves " @@ -360,20 +375,20 @@ msgstr "" "Το gtkdoc-scanobj μπορεί επίσης να χρησιμοποιηθεί " "για να κάνει δυναμική αναζήτηση σε μια βιβλιοθήκη για ενδεχόμενες υποκλάσεις " "GObject. Αποθηκεύει τις πληροφορίες για τη θέση κάθε αντικειμένου στην " -"ιεραρχία κλάσεων καθώς και για τα ορίσματα και σήματα GObject που περιέχει." +"ιεραρχία κλάσεων καθώς και για τις ιδιότητες και σήματα GObject που περιέχει." #. (itstool) path: listitem/para -#: C/index.docbook:228 +#: C/index.docbook:234 msgid "" "gtkdoc-scanobj should not be used anymore. It was " "needed in the past when GObject was still GtkObject inside gtk+." msgstr "" -"Το gtkdoc-scanobj δεν πρέπει να χρησιμοποιείτε " +"Το gtkdoc-scanobj δεν πρέπει να χρησιμοποιείται " "πλέον. Χρειαζόταν στο παρελθόν όταν το GObject ήταν ακόμα GtkObject μέσα στη " "gtk+." #. (itstool) path: listitem/para -#: C/index.docbook:235 +#: C/index.docbook:241 msgid "" "Generating the \"template\" files. gtkdoc-" "mktmpl creates a number of files in the gtkdocize supports now " @@ -406,7 +421,7 @@ msgstr "" "σύστημα ελέγχου εκδόσεων)." #. (itstool) path: listitem/para -#: C/index.docbook:256 +#: C/index.docbook:262 msgid "" "Generating the SGML/XML and HTML/PDF. " "gtkdoc-mkdb turns the template files into SGML or " @@ -427,7 +442,7 @@ msgstr "" "το βιβλίο τεκμηρίωσης XML." #. (itstool) path: listitem/para -#: C/index.docbook:267 +#: C/index.docbook:273 msgid "" "gtkdoc-mkhtml turns the SGML/XML files into HTML " "files in the html/ subdirectory. " @@ -441,7 +456,7 @@ msgstr "" "package>.pdf." #. (itstool) path: listitem/para -#: C/index.docbook:273 +#: C/index.docbook:279 msgid "" "Files in sgml/ or xml/ and html/sgml/, " "xml/ και html/ αντικαθίστανται αυτόματα. Επομένως, δεν πρέπει να τα " -"αλλάζετε με το χέρι." +"επεξεργάζεστε απευθείας." #. (itstool) path: listitem/para -#: C/index.docbook:281 +#: C/index.docbook:287 msgid "" "Fixing up cross-references between documents. After " "installing the HTML files, gtkdoc-fixxref can be " @@ -479,23 +494,24 @@ msgstr "" "εγκατεστημένη η τεκμηρίωση)." #. (itstool) path: sect1/title -#: C/index.docbook:299 +#: C/index.docbook:305 msgid "Getting GTK-Doc" msgstr "Λήψη GTK-Doc" #. (itstool) path: sect2/title -#: C/index.docbook:302 +#: C/index.docbook:308 msgid "Requirements" msgstr "Απαιτήσεις" #. (itstool) path: sect2/para -#: C/index.docbook:303 +#: C/index.docbook:309 msgid "Perl v5 - the main scripts are in Perl." msgstr "" -"Perl v5 - τα βασικά σενάρια είναι γραμμένα σε Perl." +"Perl v5 - οι κύριες δέσμες ενεργειών είναι γραμμένες σε " +"Perl." #. (itstool) path: sect2/para -#: C/index.docbook:306 +#: C/index.docbook:312 msgid "" "xsltproc - the xslt processor from libxslt xmlsoft.org/XSLT/" @@ -505,68 +521,68 @@ msgstr "" "\">xmlsoft.org/XSLT/" #. (itstool) path: sect2/para -#: C/index.docbook:310 +#: C/index.docbook:316 msgid "" "docbook-xsl - the docbook xsl stylesheets sourceforge.net/projects/docbook/files/docbook-xsl" msgstr "" -"docbook-xsl - τα docbook xsl stylesheets docbook-xsl - τα φύλλα στυλ docbook xsl sourceforge.net/projects/docbook/files/docbook-xsl" #. (itstool) path: sect2/para -#: C/index.docbook:314 +#: C/index.docbook:320 msgid "Python - optional - for gtkdoc-depscan" msgstr "Python - προαιρετική - για το gtkdoc-depscan" #. (itstool) path: sect2/para -#: C/index.docbook:317 +#: C/index.docbook:323 msgid "" "One of source-highlight, highlight " "or vim - optional - used for syntax highlighting of " "examples" msgstr "" "Ένα από τα source-highlight, highlight ή vim - optional - που χρησιμοποιούνται για " -"την επισήμανση της σύνταξης στα παραδείγματα" +"guilabel> ή vim - προαιρετικά - που χρησιμοποιούνται " +"για την επισήμανση της σύνταξης στα παραδείγματα" #. (itstool) path: sect1/title -#: C/index.docbook:325 +#: C/index.docbook:331 msgid "About GTK-Doc" msgstr "Περί GTK-Doc" #. (itstool) path: sect1/para -#: C/index.docbook:327 C/index.docbook:341 +#: C/index.docbook:333 C/index.docbook:347 msgid "(FIXME)" msgstr "(ΠΡΟΣ ΔΙΟΡΘΩΣΗ)" #. (itstool) path: sect1/para -#: C/index.docbook:331 +#: C/index.docbook:337 msgid "" "(History, authors, web pages, mailing list, license, future plans, " "comparison with other similar systems.)" msgstr "" -"(Ιστορικό, συγγραφείς, ιστοσελίδες, ταχυδρομική λίστα, άδεια, μελλοντικά " +"(Ιστορικό, συγγραφείς, ιστοσελίδες, λίστα αλληλογραφίας, άδεια, μελλοντικά " "σχέδια, σύγκριση με άλλα παρόμοια συστήματα.)" #. (itstool) path: sect1/title -#: C/index.docbook:339 +#: C/index.docbook:345 msgid "About this Manual" msgstr "Περί του εγχειριδίου" #. (itstool) path: sect1/para -#: C/index.docbook:345 +#: C/index.docbook:351 msgid "(who it is meant for, where you can get it, license)" msgstr "(σε ποιους απευθύνεται, πού θα το βρείτε, άδεια)" #. (itstool) path: chapter/title -#: C/index.docbook:354 +#: C/index.docbook:360 msgid "Setting up your project" msgstr "Δημιουργώντας το δικό σας έργο" #. (itstool) path: chapter/para -#: C/index.docbook:356 +#: C/index.docbook:362 msgid "" "The next sections describe what steps to perform to integrate GTK-Doc into " "your project. Theses sections assume we work on a project called 'meep'. " @@ -579,19 +595,19 @@ msgstr "" "Οι επόμενες ενότητες περιγράφουν τα βήματα που απαιτούνται για να " "ενσωματώσετε το GTK-Doc στο έργο σας. Αυτές οι ενότητες προϋποθέτουν ότι " "εργάζεσθε σε ένα έργο που λέγεται 'meep'. Το έργο περιέχει τη βιβλιοθήκη " -"'libmeep' και την εφαρμογή 'meeper' για τον τελικό χρήστη. Προϋποτίθεται " -"επίσης ότι θα χρησιμοποιείτε το autoconf και το automake. Επιπλέον, η " -"ενότητα αρχεία makefiles ή άλλα συστήματα " -"ανάπτυξης περιγράφει τα βασικά που χρειάζονται για να δουλέψετε σε " -"ένα διαφορετικό έργο." +"'libmeep' και την εφαρμογή 'meeper' για τον τελικό χρήστη. Θεωρούμε επίσης, " +"ότι θα χρησιμοποιείτε το autoconf και το automake. Επιπλέον, η ενότητα αρχεία makefiles ή άλλα συστήματα ανάπτυξης θα περιγράψει τα βασικά στοιχεία που απαιτούνται για να εργαστείτε σε " +"μια διαφορετική δόμηση ρυθμίσεων." #. (itstool) path: sect1/title -#: C/index.docbook:367 +#: C/index.docbook:373 msgid "Setting up a skeleton documentation" msgstr "Δημιουργία του σκελετού τεκμηρίωσης" #. (itstool) path: sect1/para -#: C/index.docbook:369 +#: C/index.docbook:375 msgid "" "Under your top-level project directory create folders called docs/reference " "(this way you can also have docs/help for end-user documentation). It is " @@ -605,12 +621,12 @@ msgstr "" "περιλαμβάνουν μόνο μία βιβλιοθήκη." #. (itstool) path: example/title -#: C/index.docbook:378 +#: C/index.docbook:384 msgid "Example directory structure" msgstr "Παράδειγμα δομής καταλόγου" #. (itstool) path: example/programlisting -#: C/index.docbook:379 +#: C/index.docbook:385 #, no-wrap msgid "" "\n" @@ -634,27 +650,27 @@ msgstr "" " meeper/\n" #. (itstool) path: sect1/para -#: C/index.docbook:376 +#: C/index.docbook:382 msgid "This can then look as shown below: <_:example-1/>" msgstr "Αυτό θα φαίνεται, λοιπόν, όπως εμφανίζεται παρακάτω: <_:example-1/>" #. (itstool) path: sect1/title #. (itstool) path: example/title -#: C/index.docbook:394 C/index.docbook:401 +#: C/index.docbook:400 C/index.docbook:407 msgid "Integration with autoconf" msgstr "Ενσωμάτωση στο autoconf" #. (itstool) path: sect1/para -#: C/index.docbook:396 +#: C/index.docbook:402 msgid "" "Very easy! Just add one line to your configure.ac " "script." msgstr "" -"Πολύ εύκολα! Απλά προσθέτετε μία γραμμή στο σενάριο configure.ac." +"Πολύ εύκολα! Απλά προσθέτετε μία γραμμή στη δέσμη ενεργειών " +"configure.ac." #. (itstool) path: example/programlisting -#: C/index.docbook:402 +#: C/index.docbook:408 #, no-wrap msgid "" "\n" @@ -666,12 +682,12 @@ msgstr "" "GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" #. (itstool) path: example/title -#: C/index.docbook:414 +#: C/index.docbook:420 msgid "Keep gtk-doc optional" -msgstr "Προαιρετικά κρατήστε το gtk-doc" +msgstr "Προαιρετικά διατηρήστε το gtk-doc" #. (itstool) path: example/programlisting -#: C/index.docbook:415 +#: C/index.docbook:421 #, no-wrap msgid "" "\n" @@ -691,7 +707,7 @@ msgstr "" "])\n" #. (itstool) path: sect1/para -#: C/index.docbook:409 +#: C/index.docbook:415 msgid "" "This will require all developers to have gtk-doc installed. If it is okay " "for your project to have optional api-doc build setup, you can solve this as " @@ -699,13 +715,13 @@ msgid "" "function> at the start of a line. <_:example-1/>" msgstr "" "Αυτό απαιτεί από όλους τους προγραμματιστές να έχουν εγκατεστημένο το gtk-" -"doc. Αν είναι εντάξει για το έργο σας να έχετε μια επιπλέον κατασκευή " -"ρυθμίσεων για το api-doc, μπορείτε να το επιλύσετε όπως αναφέρεται παρακάτω. " -"Αφήστε το ως έχει, όσο το gtkdocize αναζητά την αρχή της σειράς για το " +"doc. Αν είναι εντάξει για το έργο σας να έχετε μια επιπλέον δόμηση ρυθμίσεων " +"για το api-doc, μπορείτε να το επιλύσετε όπως αναφέρεται παρακάτω. Αφήστε το " +"ως έχει, όσο το gtkdocize αναζητά την αρχή της σειράς για το " "GTK_DOC_CHECK. <_:example-1/>" #. (itstool) path: sect1/para -#: C/index.docbook:426 +#: C/index.docbook:432 msgid "" "The first argument is used to check for the gtkdocversion at configure time. " "The 2nd, optional argument is used by gtkdocize. " @@ -718,29 +734,30 @@ msgstr "" "symbol> επίσης προσθέτει αρκετούς διακόπτες ρύθμισης:" #. (itstool) path: listitem/para -#: C/index.docbook:432 +#: C/index.docbook:438 msgid "--with-html-dir=PATH : path to installed docs" -msgstr "--with-html-dir=ΔΙΑΔΡΟΜΗ : διαδρομή προς την εγκατεστημένη τεκμηρίωση" +msgstr "--with-html-dir= PATH : διαδρομή προς την εγκατεστημένη τεκμηρίωση" #. (itstool) path: listitem/para -#: C/index.docbook:433 +#: C/index.docbook:439 msgid "--enable-gtk-doc : use gtk-doc to build documentation [default=no]" -msgstr "--enable-gtk-doc : χρήση gtk-doc για την τεκμηρίωση [default=no]" +msgstr "" +"--enable-gtk-doc : χρήση gtk-doc για τη δόμηση τεκμηρίωσης [προεπιλογή=no]" #. (itstool) path: listitem/para -#: C/index.docbook:434 +#: C/index.docbook:440 msgid "" "--enable-gtk-doc-html : build documentation in html format [default=yes]" msgstr "" -"--enable-gtk-doc-html : παραγωγή τεκμηρίωσης σε μορφή html [default=yes]" +"--enable-gtk-doc-html : δόμηση τεκμηρίωσης σε μορφή html [προεπιλογή=yes]" #. (itstool) path: listitem/para -#: C/index.docbook:435 +#: C/index.docbook:441 msgid "--enable-gtk-doc-pdf : build documentation in pdf format [default=no]" -msgstr "--enable-gtk-doc-pdf : παραγωγή τεκμηρίωσης σε μορφή pdf [default=no]" +msgstr "--enable-gtk-doc-pdf : δόμηση τεκμηρίωσης σε μορφή pdf [προεπιλογή=no]" #. (itstool) path: important/para -#: C/index.docbook:439 +#: C/index.docbook:445 msgid "" "GTK-Doc is disabled by default! Remember to pass the option to the next configure run. " @@ -754,25 +771,25 @@ msgstr "" "τον προγραμματιστή)." #. (itstool) path: sect1/para -#: C/index.docbook:447 +#: C/index.docbook:453 msgid "" "Furthermore it is recommended that you have the following line inside you " "configure.ac script. This allows " "gtkdocize to automatically copy the macro " "definition for GTK_DOC_CHECK to your project." msgstr "" -"Επίσης, συνιστάται να προσθέσετε την ακόλουθη γραμμή στο σενάριο " -"configure.ac. Επιτρέπει στο gtkdocize να αντιγράφει αυτόματα τον ορισμό της μακροεντολής " +"Επίσης, συνιστάται να προσθέσετε την ακόλουθη γραμμή στη δέσμη ενεργειών " +"configure.ac. Αυτό επιτρέπει στο gtkdocize να αντιγράφει αυτόματα τον ορισμό της μακροεντολής για το " "GTK_DOC_CHECK στο έργο σας." #. (itstool) path: example/title -#: C/index.docbook:455 +#: C/index.docbook:461 msgid "Preparation for gtkdocize" msgstr "Προετοιμασία για το gtkdocize" #. (itstool) path: example/programlisting -#: C/index.docbook:456 +#: C/index.docbook:462 #, no-wrap msgid "" "\n" @@ -782,24 +799,24 @@ msgstr "" "AC_CONFIG_MACRO_DIR(m4)\n" #. (itstool) path: sect1/para -#: C/index.docbook:461 +#: C/index.docbook:467 msgid "" "After all changes to configure.ac are made, update the " "configure file. This can be done by re-running " "autoreconf -i or autogen.sh." msgstr "" "Όταν όλες οι αλλαγές στο configure.ac έχουν γίνει, " -"ενημερώστε το αρχείο ρύθμιση. Αυτό μπορείτε να το " +"ενημερώστε το αρχείο configure. Αυτό μπορείτε να το " "κάνετε επανεκετελώντας το autoreconf -i ή το autogen.sh." #. (itstool) path: sect1/title -#: C/index.docbook:469 +#: C/index.docbook:475 msgid "Integration with automake" msgstr "Ενσωμάτωση στο automake" #. (itstool) path: sect1/para -#: C/index.docbook:471 +#: C/index.docbook:477 msgid "" "First copy the Makefile.am from the examples sub directory of the Makefile.am. All the settings have a comment above that describes their " @@ -833,17 +850,17 @@ msgstr "" "am. Πριν από κάθε ρύθμιση υπάρχει ένα σχόλιο που εξηγεί τη " "χρησιμότητά της. Οι περισσότερες είναι σημαίες που στέλνονται στα αντίστοιχα " "εργαλεία. Κάθε εργαλείο διαθέτει μια μεταβλητή της μορφής . όλα τα εργαλεία υποστηρίζουν την " -"επιλογή για την παραγωγή λίστας με τις " -"υποστηριζόμενες παραμέτρους." +"TOOLNAME>_OPTIONS. Όλα τα εργαλεία υποστηρίζουν την επιλογή " +" για την παραγωγή λίστας με τις υποστηριζόμενες " +"παραμέτρους." #. (itstool) path: sect1/title -#: C/index.docbook:496 +#: C/index.docbook:502 msgid "Integration with autogen" msgstr "Ενσωμάτωση στο autogen" #. (itstool) path: sect1/para -#: C/index.docbook:498 +#: C/index.docbook:504 msgid "" "Most projects will have an autogen.sh script to setup " "the build infrastructure after a checkout from version control system (such " @@ -852,19 +869,18 @@ msgid "" "autoheader, automake or autoconf." msgstr "" "Τα περισσότερα έργα διαθέτουν ένα σενάριο autogen.sh " -"για τη δημιουργία υποδομών μετά από έναν έλεγχο από το σύστημα ελέγχου " -"εκδόσεων (π.χ., cvs/svn/git). Το GTK-Doc διαθέτει το εργαλείο " -"gtkdocize, το οποίο μπορεί να χρησιμοποιηθεί για ένα " -"τέτοιο σενάριο. Θα πρέπει να εκτελείται πριν το autoheader, το automake ή το " -"autoconf." +"για τη δόμηση υποδομών μετά από έναν έλεγχο από το σύστημα ελέγχου εκδόσεων " +"(π.χ., cvs/svn/git). Το GTK-Doc διαθέτει το εργαλείο gtkdocize, το οποίο μπορεί να χρησιμοποιηθεί για ένα τέτοιο σενάριο. Θα " +"πρέπει να εκτελείται πριν το autoheader, το automake ή το autoconf." #. (itstool) path: example/title -#: C/index.docbook:507 +#: C/index.docbook:513 msgid "Running gtkdocize from autogen.sh" msgstr "Εκτέλεση του gtkdocize από το autogen.sh" #. (itstool) path: example/programlisting -#: C/index.docbook:508 +#: C/index.docbook:514 #, no-wrap msgid "" "\n" @@ -874,7 +890,7 @@ msgstr "" "gtkdocize || exit 1\n" #. (itstool) path: sect1/para -#: C/index.docbook:514 +#: C/index.docbook:520 msgid "" "When running gtkdocize it copies gtk-" "doc.make to your project root (or any directory specified by the " @@ -884,12 +900,12 @@ msgid "" msgstr "" "Κατά την εκτέλεσή του, το gtkdocize αντιγράφει το " "gtk-doc.make στο ριζικό κατάλογο του έργου σας (ή στον " -"κατάλογο που ορίζει η επιλογή ). Επίσης, ελέγχει το " -"σενάριο configure για να βρει την κλήση στο GTK_DOC_CHECK--docdir). Επίσης, ελέγχει τη " +"δέσμη ενεργειών configure για να βρει την κλήση στο GTK_DOC_CHECK." #. (itstool) path: sect1/para -#: C/index.docbook:523 +#: C/index.docbook:529 msgid "" "Historically GTK-Doc was generating template files where developers entered " "the docs. This turned out to be not so good (e.g. the need for having " @@ -922,26 +938,26 @@ msgstr "" #. (itstool) path: sect1/title #. (itstool) path: example/title -#: C/index.docbook:540 C/index.docbook:557 +#: C/index.docbook:546 C/index.docbook:563 msgid "Running the doc build" -msgstr "Παραγωγή της τεκμηρίωσης" +msgstr "Εκτέλεση της δόμησης τεκμηρίωσης" #. (itstool) path: sect1/para -#: C/index.docbook:542 +#: C/index.docbook:548 msgid "" "After the previous steps it's time to run the build. First we need to rerun " "autogen.sh. If this script runs configure for you, then " "give it the option. Otherwise manually run " "configure with this option afterwards." msgstr "" -"Αφού ολοκληρωθούν τα προηγούμενα βήματα, προχωρήστε στην παραγωγή. Πρώτα, θα " +"Αφού ολοκληρωθούν τα προηγούμενα βήματα, προχωρήστε στην δόμηση. Πρώτα, θα " "πρέπει να εκτελεσθεί εκ νέου το autogen.sh. Αν το " "σενάριο εκτελεί και το configure, προσθέστε την επιλογή . Διαφορετικά, εκτελέστε εσείς τοconfigure " "με αυτή την επιλογή." #. (itstool) path: sect1/para -#: C/index.docbook:549 +#: C/index.docbook:555 msgid "" "The first make run generates several additional files in the doc-" "directories. The important ones are: <package>.types<package>-sections.txt." #. (itstool) path: example/programlisting -#: C/index.docbook:558 +#: C/index.docbook:564 #, no-wrap msgid "" "\n" @@ -966,7 +982,7 @@ msgstr "" "make\n" #. (itstool) path: sect1/para -#: C/index.docbook:564 +#: C/index.docbook:570 msgid "" "Now you can point your browser to docs/reference/<package>/" "index.html. Yes, it's a bit disappointing still. But hang-on, " @@ -978,32 +994,43 @@ msgstr "" "κεφάλαιο θα μάθετε πώς μπορείτε να ζωντανέψετε τις σελίδες σας." #. (itstool) path: sect1/title -#: C/index.docbook:572 +#: C/index.docbook:578 msgid "Integration with version control systems" msgstr "Ενσωμάτωση σε συστήματα ελέγχου εκδόσεων" #. (itstool) path: sect1/para -#: C/index.docbook:574 +#: C/index.docbook:580 msgid "" -"As a rule of the thumb, it's those files you edit, that should go under " -"version control. For typical projects it's these files: <" -"package>.types, <package>-docs.xml " -"(in the past .sgml), <package>-sections.txt, " -"Makefile.am" +"As a rule of thumb, it's the files you edit which should go under version " +"control. For typical projects it's these files: <package>." +"types, <package>-docs.xml (in the " +"past .sgml), <package>-sections.txt, " +"Makefile.am." msgstr "" "Ο εμπειρικός κανόνας είναι ότι αυτά τα αρχεία που επεξεργασθήκατε πρέπει να " "περάσουν από τον έλεγχο έκδοσης. Για τυπικά έργα, πρόκειται για τα αρχεία: " -"<package>.types, <package>-docs.." +"<package>.types, <package>-docs." "xml (στο παρελθόν .sgml), <package>-sections.txt, Makefile.am" +"filename>, Makefile.am." + +#. (itstool) path: sect1/para +#: C/index.docbook:588 +msgid "" +"Files in the xml/ and html/ " +"directories should not go under version control. Neither should any of the " +".stamp files." +msgstr "" +"Αρχεία στους καταλόγους xml/ και html/ δεν θα πρέπει να υποβληθούν σε έλεγχο έκδοσης. Ούτε και αρχεία " +"xml/ and html/." #. (itstool) path: sect1/title -#: C/index.docbook:585 +#: C/index.docbook:596 msgid "Integration with plain makefiles or other build systems" -msgstr "Ενσωμάτωση στα αρχεία makefiles ή άλλα συστήματα ανάπτυξης" +msgstr "Ενσωμάτωση στα αρχεία makefiles ή άλλα συστήματα δόμησης" #. (itstool) path: sect1/para -#: C/index.docbook:587 +#: C/index.docbook:598 msgid "" "In the case one does not want to use automake and therefore gtk-" "doc.mak one will need to call the gtkdoc tools in the right order " @@ -1011,24 +1038,23 @@ msgid "" msgstr "" "Στην περίπτωση που κάποιος δε θέλει να χρησιμοποιήσει το automake και, " "επομένως, το gtk-doc.mak θα χρειαστεί να καλέσει τα " -"εργαλεία του gtkdoc στη σωστή σειρά στα makefiles (ή άλλα εργαλεία " -"ανάπτυξης)." +"εργαλεία του gtkdoc στη σωστή σειρά στα makefiles (ή άλλα εργαλεία δόμησης)." #. (itstool) path: example/title -#: C/index.docbook:594 +#: C/index.docbook:605 msgid "Documentation build steps" -msgstr "Βήματα παραγωγής τεκμηρίωσης" +msgstr "Βήματα δόμησης τεκμηρίωσης" #. (itstool) path: example/programlisting -#: C/index.docbook:595 +#: C/index.docbook:606 #, no-wrap msgid "" "\n" "DOC_MODULE=meep\n" "// sources have changed\n" -"gtkdoc-scan --module=$(DOC_MODULE) --source-dir=...\n" +"gtkdoc-scan --module=$(DOC_MODULE) <source-dir>\n" "gtkdoc-scangobj --module=$(DOC_MODULE)\n" -"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml\n" +"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir=<source-dir>\n" "// xml files have changed\n" "mkdir html\n" "cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml\n" @@ -1046,7 +1072,7 @@ msgstr "" "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html\n" #. (itstool) path: sect1/para -#: C/index.docbook:609 +#: C/index.docbook:620 msgid "" "One will need to look at the Makefile.am and " "gtk-doc.mak to pick the extra options needed." @@ -1056,12 +1082,12 @@ msgstr "" "χρειάζονται." #. (itstool) path: chapter/title -#: C/index.docbook:618 +#: C/index.docbook:629 msgid "Documenting the code" msgstr "Τεκμηρίωση κώδικα" #. (itstool) path: chapter/para -#: C/index.docbook:620 +#: C/index.docbook:631 msgid "" "GTK-Doc uses source code comment with a special syntax for code " "documentation. Further it retrieves information about your project structure " @@ -1074,12 +1100,12 @@ msgstr "" "λεπτομέρειες για τη σύνταξη αυτών των σχολίων." #. (itstool) path: note/title -#: C/index.docbook:628 +#: C/index.docbook:639 msgid "Documentation placement" msgstr "Τοποθέτηση τεκμηρίωσης" #. (itstool) path: note/para -#: C/index.docbook:629 +#: C/index.docbook:640 msgid "" "In the past most documentation had to be filled into files residing inside " "the tmpl directory. This has the disadvantages that the " @@ -1092,7 +1118,7 @@ msgstr "" "συγκρούσεις με τα συστήματα ελέγχου εκδόσεων." #. (itstool) path: note/para -#: C/index.docbook:635 +#: C/index.docbook:646 msgid "" "The avoid the aforementioned problems we suggest putting the documentation " "inside the sources. This manual will only describe this way of documenting " @@ -1103,12 +1129,12 @@ msgstr "" "περιγράψουμε σε αυτό το εγχειρίδιο." #. (itstool) path: example/title -#: C/index.docbook:646 C/index.docbook:663 +#: C/index.docbook:657 C/index.docbook:674 msgid "GTK-Doc comment block" msgstr "Μπλοκ σχολίου GTK-Doc" #. (itstool) path: example/programlisting -#: C/index.docbook:647 +#: C/index.docbook:658 #, no-wrap msgid "" "\n" @@ -1122,24 +1148,24 @@ msgstr "" "#endif\n" #. (itstool) path: chapter/para -#: C/index.docbook:642 +#: C/index.docbook:653 msgid "" "The scanner can handle the majority of C headers fine. In the case of " "receiving warnings from the scanner that look like a special case, one can " "hint GTK-Doc to skip over them. <_:example-1/>" msgstr "" -"Ο σαρωτής μπορεί να χειρισθεί άνετα την πλειοψηφία των κεφαλίδων C . Σε " +"Ο σαρωτής μπορεί να χειρισθεί άνετα την πλειοψηφία των κεφαλίδων C. Σε " "περίπτωση που παίρνετε προειδοποιήσεις από τον σαρωτή οι οποίες μοιάζουν με " "έναν ειδικό χαρακτήρα, μπορείτε να υποδείξετε στο GTK-Doc να τους " "παραλείψει. <_:example-1/>" #. (itstool) path: sect1/title -#: C/index.docbook:658 +#: C/index.docbook:669 msgid "Documentation comments" msgstr "Σχόλια τεκμηρίωσης" #. (itstool) path: example/programlisting -#: C/index.docbook:664 +#: C/index.docbook:675 #, no-wrap msgid "" "\n" @@ -1155,7 +1181,7 @@ msgstr "" " */\n" #. (itstool) path: sect1/para -#: C/index.docbook:660 +#: C/index.docbook:671 msgid "" "A multiline comment that starts with an additional '*' marks a documentation " "block that will be processed by the GTK-Doc tools. <_:example-1/>" @@ -1165,7 +1191,7 @@ msgstr "" "Doc. <_:example-1/>" #. (itstool) path: sect1/para -#: C/index.docbook:673 +#: C/index.docbook:684 msgid "" "The 'identifier' is one line with the name of the item the comment is " "related to. The syntax differs a little depending on the item. (TODO add " @@ -1176,7 +1202,7 @@ msgstr "" "στοιχείου. (ΜΕΛΛΟΝΤΙΚΑ: να προστεθεί πίνακας με τα αναγνωριστικά)" #. (itstool) path: sect1/para -#: C/index.docbook:679 +#: C/index.docbook:690 msgid "" "The 'documentation' block is also different for each symbol type. Symbol " "types that get parameters such as functions or macros have the parameter " @@ -1197,7 +1223,7 @@ msgstr "" "κώδικα)." #. (itstool) path: listitem/para -#: C/index.docbook:696 +#: C/index.docbook:707 msgid "" "What it is: The name for a class or function can sometimes be misleading for " "people coming from a different background." @@ -1206,26 +1232,26 @@ msgstr "" "παραπλανητικό για ανθρώπους που δεν έχουν τεχνογνωσία στο θέμα." #. (itstool) path: listitem/para -#: C/index.docbook:702 +#: C/index.docbook:713 msgid "" "What it does: Tell about common uses. Put it in relation with the other API." msgstr "" "Τι κάνει: Αναφέρει τις κοινές χρήσεις και τις βάζει σε σχέση με άλλο API." #. (itstool) path: tip/para -#: C/index.docbook:692 +#: C/index.docbook:703 msgid "When documenting code, describe two aspects: <_:itemizedlist-1/>" msgstr "Όταν τεκμηριώνετε κώδικα, περιγράψτε δύο πλευρές: <_:itemizedlist-1/>" #. (itstool) path: listitem/para -#: C/index.docbook:717 +#: C/index.docbook:728 msgid "Use function() to refer to functions or macros which take arguments." msgstr "" "Χρησιμοποιήστε το function() για να αναφερθείτε σε συναρτήσεις ή " "μακροεντολές που δέχονται ορίσματα." #. (itstool) path: listitem/para -#: C/index.docbook:722 +#: C/index.docbook:733 msgid "" "Use @param to refer to parameters. Also use this when referring to " "parameters of other functions, related to the one being described." @@ -1235,14 +1261,14 @@ msgstr "" "συναρτήσεων, σχετικών με την περιγραφόμενη." #. (itstool) path: listitem/para -#: C/index.docbook:728 +#: C/index.docbook:739 msgid "Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS." msgstr "" "Χρησιμοποιήστε το %constant για να αναφερθείτε σε σταθερές, π.χ. " "%G_TRAVERSE_LEAFS." #. (itstool) path: listitem/para -#: C/index.docbook:733 +#: C/index.docbook:744 msgid "" "Use #symbol to refer to other types of symbol, e.g. structs and enums and " "macros which don't take arguments." @@ -1251,20 +1277,20 @@ msgstr "" "δομές, αριθμήσεις και μακροεντολές που δε δέχονται ορίσματα." #. (itstool) path: listitem/para -#: C/index.docbook:739 +#: C/index.docbook:750 msgid "Use #Object::signal to refer to a GObject signal." msgstr "" "Χρησιμοποιήστε το #Object::signal για να αναφερθείτε σε ένα σήμα GObject." #. (itstool) path: listitem/para -#: C/index.docbook:744 +#: C/index.docbook:755 msgid "Use #Object:property to refer to a GObject property." msgstr "" "Χρησιμοποιήστε το #Object::property για να αναφερθείτε σε μία ιδιότητα " "GObject." #. (itstool) path: listitem/para -#: C/index.docbook:749 +#: C/index.docbook:760 msgid "" "Use #Struct.field to refer to a field inside a structure and #GObjectClass." "foo_bar() to refer to a vmethod." @@ -1273,7 +1299,7 @@ msgstr "" "δομή και #GObjectClass.foo_bar() για να αναφερθείτε σε μια vmethod." #. (itstool) path: sect1/para -#: C/index.docbook:711 +#: C/index.docbook:722 msgid "" "One advantage of hyper-text over plain-text is the ability to have links in " "the document. Writing the correct markup for a link can be tedious though. " @@ -1281,13 +1307,13 @@ msgid "" "itemizedlist-1/>" msgstr "" "Ένα πλεονέκτημα της χρήσης υπερκειμένου αντί για απλό κείμενο, είναι η " -"δυνατότητα προσθήκης συνδέσμων στο έγγραφο. Ωστόσο, η χρήση της σωστής " -"σύνταξης για τη δημιουργία συνδέσμων μπορεί να είναι αρκετά κουραστική " -"διαδικασία. Το GTK-Doc σας βοηθάει, παρέχοντάς σας μια σειρά από χρήσιμες " -"συντμήσεις. <_:itemizedlist-1/>" +"δυνατότητα προσθήκης συνδέσμων στο έγγραφο. Ωστόσο, η συγγραφή της σωστής " +"επισήμανσης για έναν σύνδεσμο μπορεί να είναι αρκετά κουραστική διαδικασία. " +"Το GTK-Doc σας βοηθάει, παρέχοντάς σας μια σειρά από χρήσιμες συντομεύσεις. " +"<_:itemizedlist-1/>" #. (itstool) path: tip/para -#: C/index.docbook:758 +#: C/index.docbook:769 msgid "" "If you need to use the special characters '<', '>', '()', '@', '%', or " "'#' in your documentation without GTK-Doc changing them you can use the XML " @@ -1303,7 +1329,7 @@ msgstr "" "διαφυγής." #. (itstool) path: sect1/para -#: C/index.docbook:767 +#: C/index.docbook:778 msgid "" "DocBook can do more than just links. One can also have lists, examples, " "headings, and images. As of version 1.20, the preferred way is to use a " @@ -1322,7 +1348,7 @@ msgstr "" "εμφανίζονται σαν γραμμές που αρχίζουν με μια παύλα." #. (itstool) path: sect1/para -#: C/index.docbook:778 +#: C/index.docbook:789 msgid "" "In older GTK-Doc releases, if you need support for additional formatting, " "you would need to enable the usage of docbook SGML/XML tags inside doc-" @@ -1337,12 +1363,12 @@ msgstr "" "μέσα στο Makefile.am." #. (itstool) path: example/title -#: C/index.docbook:788 +#: C/index.docbook:799 msgid "GTK-Doc comment block using Markdown" msgstr "Μπλοκ σχολίου GTK-Doc χρησιμοποιώντας Markdown" #. (itstool) path: example/programlisting -#: C/index.docbook:789 +#: C/index.docbook:800 #, no-wrap msgid "" "\n" @@ -1383,42 +1409,42 @@ msgid "" msgstr "" "\n" "/**\n" -" * ταυτοποιητικό:\n" +" * identifier:\n" " *\n" -" * παράγραφος τεκμηρίωσης ...\n" +" * documentation paragraph ...\n" " *\n" -" * # Υπο Κεφαλίδα #\n" +" * # Sub Heading #\n" " *\n" -" * ## Δεύτερη Υπο Κεφαλίδα\n" +" * ## Second Sub Heading\n" " *\n" -" * # Υπο Κεφαλίδα με έναν αγκυρωμένο σύνδεσμο # {#heading-two}\n" +" * # Sub Heading With a Link Anchor # {#heading-two}\n" " *\n" -" * περισσότερη τεκμηρίωση:\n" +" * more documentation:\n" " *\n" -" * - καταχώρηση λίστας 1\n" +" * - list item 1\n" " *\n" -" * Παράγραφος μέσα σε μια καταχώρηση λίστας.\n" +" * Paragraph inside a list item.\n" " *\n" -" * - καταχώρηση λίστας 2\n" +" * - list item 2\n" " *\n" -" * 1. αριθμημένη καταχώρηση λίστας\n" +" * 1. numbered list item\n" " *\n" -" * 2. μια άλλη αριθμημένη καταχώρηση λίστας\n" +" * 2. another numbered list item\n" " *\n" -" * Μια άλλη παράγραφος. [Ένας σύνδεσμος στον ιστότοπο του GNOME](http://www.gnome.org/)\n" +" * Another paragraph. [A Link to the GNOME Website](http://www.gnome.org/)\n" " *\n" -" * ![μια εικόνα inline][plot-result.png]\n" +" * ![an inline image][plot-result.png]\n" " *\n" -" * [Ένας σύνδεσμος στον παραπάνω heading anchor][heading-two]\n" +" * [A link to the heading anchor above][heading-two]\n" " *\n" -" * Ένα παράδειγμα γλώσσας-C:\n" -" * |[<!-- γλώσσα=\"C\" -->\n" -" * GtkWidget *label = gtk_label_new (\"Υπέροχη!\");\n" +" * A C-language example:\n" +" * |[<!-- language=\"C\" -->\n" +" * GtkWidget *label = gtk_label_new (\"Gorgeous!\");\n" " * ]|\n" " */\n" #. (itstool) path: sect1/para -#: C/index.docbook:828 +#: C/index.docbook:839 msgid "" "More examples of what markdown tags are supported can be found in the ." #. (itstool) path: tip/para -#: C/index.docbook:834 +#: C/index.docbook:845 msgid "" "As already mentioned earlier GTK-Doc is for documenting public API. Thus one " "cannot write documentation for static symbols. Nevertheless it is good to " @@ -1450,30 +1476,30 @@ msgstr "" "να εισαχθεί το όνομα του συμβόλου στην κατάλληλη θέση του αρχείου ενοτήτων." #. (itstool) path: sect1/title -#: C/index.docbook:848 +#: C/index.docbook:859 msgid "Documenting sections" msgstr "Τεκμηρίωση ενοτήτων" #. (itstool) path: sect1/para -#: C/index.docbook:850 +#: C/index.docbook:861 msgid "" "Each section of the documentation contains information about one class or " "module. To introduce the component one can write a section block. The short " "description is also used inside the table of contents. All the @fields are " "optional." msgstr "" -"Κάθε ενότητα της τεκμηρίωσης περιέχει πληροφορίες για μία κλάση ή ένα " +"Κάθε ενότητα της τεκμηρίωσης περιέχει πληροφορίες για μια κλάση ή ένα " "άρθρωμα. Για να εισάγετε το συστατικό μπορείτε να γράψετε ένα μπλοκ σχολίου " "ενότητας. Η σύντομη αυτή περιγραφή χρησιμοποιείται και για τον πίνακα " "περιεχομένων. Όλα τα πεδία @fields είναι προαιρετικά." #. (itstool) path: example/title -#: C/index.docbook:858 +#: C/index.docbook:869 msgid "Section comment block" msgstr "Μπλοκ σχολίου ενότητας" #. (itstool) path: example/programlisting -#: C/index.docbook:859 +#: C/index.docbook:870 #, no-wrap msgid "" "\n" @@ -1505,12 +1531,12 @@ msgstr "" " */\n" #. (itstool) path: varlistentry/term -#: C/index.docbook:878 +#: C/index.docbook:889 msgid "SECTION:<name>" msgstr "SECTION:<name>" #. (itstool) path: listitem/para -#: C/index.docbook:880 +#: C/index.docbook:891 msgid "" "The name links the section documentation to the respective part in the " "<package>-sections.txt file. The name give here " @@ -1523,27 +1549,27 @@ msgstr "" "<package>-sections.txt." #. (itstool) path: varlistentry/term -#: C/index.docbook:889 +#: C/index.docbook:900 msgid "@short_description" msgstr "@short_description" #. (itstool) path: listitem/para -#: C/index.docbook:891 +#: C/index.docbook:902 msgid "" "A one line description of the section, that later will appear after the " "links in the TOC and at the top of the section page." msgstr "" -"Περιγραφή της ενότητας σε μία γραμμή, η οποία θα εμφανίζεται, στη συνέχεια, " +"Περιγραφή της ενότητας σε μια γραμμή, η οποία θα εμφανίζεται, στη συνέχεια, " "μετά από τους συνδέσμους του πίνακα περιεχομένων και στην αρχή της σελίδας " "της ενότητας." #. (itstool) path: varlistentry/term -#: C/index.docbook:898 +#: C/index.docbook:909 msgid "@title" msgstr "@title" #. (itstool) path: listitem/para -#: C/index.docbook:900 +#: C/index.docbook:911 msgid "" "The section title defaults to <name> from the SECTION declaration. It " "can be overridden with the @title field." @@ -1552,12 +1578,12 @@ msgstr "" "SECTION. Μπορεί να παρακαμφθεί με το πεδίο @title." #. (itstool) path: varlistentry/term -#: C/index.docbook:907 +#: C/index.docbook:918 msgid "@section_id" msgstr "@section_id" #. (itstool) path: listitem/para -#: C/index.docbook:909 +#: C/index.docbook:920 msgid "" "Overrides the use of title as a section identifier. For GObjects the <" "title> is used as a section_id and for other sections it is <" @@ -1568,22 +1594,22 @@ msgstr "" "άλλες ενότητες είναι <MODULE>-<title>." #. (itstool) path: varlistentry/term -#: C/index.docbook:917 +#: C/index.docbook:928 msgid "@see_also" msgstr "@see_also" #. (itstool) path: listitem/para -#: C/index.docbook:919 +#: C/index.docbook:930 msgid "A list of symbols that are related to this section." msgstr "Λίστα συμβόλων σχετικών με αυτή την ενότητα." #. (itstool) path: varlistentry/term -#: C/index.docbook:925 +#: C/index.docbook:936 msgid "@stability" msgstr "@stability" #. (itstool) path: listitem/para -#: C/index.docbook:932 +#: C/index.docbook:943 msgid "" "Stable - The intention of a Stable interface is to enable arbitrary third " "parties to develop applications to these interfaces, release them, and have " @@ -1601,7 +1627,7 @@ msgstr "" "λόγους." #. (itstool) path: listitem/para -#: C/index.docbook:944 +#: C/index.docbook:955 msgid "" "Unstable - Unstable interfaces are experimental or transitional. They are " "typically used to give outside developers early access to new or rapidly " @@ -1616,7 +1642,7 @@ msgstr "" "συμβατότητας μεταξύ μιας ελάσσονας έκδοσης και της επόμενης." #. (itstool) path: listitem/para -#: C/index.docbook:956 +#: C/index.docbook:967 msgid "" "Private - An interface that can be used within the GNOME stack itself, but " "that is not documented for end-users. Such functions should only be used in " @@ -1628,7 +1654,7 @@ msgstr "" "σαφώς καθορισμένων και τεκμηριωμένων διαδικασιών." #. (itstool) path: listitem/para -#: C/index.docbook:965 +#: C/index.docbook:976 msgid "" "Internal - An interface that is internal to a module and does not require " "end-user documentation. Functions that are undocumented are assumed to be " @@ -1639,7 +1665,7 @@ msgstr "" "περιέχουν τεκμηρίωση εκλαμβάνονται ως εσωτερικές." #. (itstool) path: listitem/para -#: C/index.docbook:927 +#: C/index.docbook:938 msgid "" "An informal description of the stability level this API has. We recommend " "the use of one of these terms: <_:itemizedlist-1/>" @@ -1648,12 +1674,12 @@ msgstr "" "συνιστούμε τη χρήση ενός από τους ακόλουθους όρους: <_:itemizedlist-1/>" #. (itstool) path: varlistentry/term -#: C/index.docbook:977 +#: C/index.docbook:988 msgid "@include" msgstr "@include" #. (itstool) path: listitem/para -#: C/index.docbook:979 +#: C/index.docbook:990 msgid "" "The #include files to show in the section synopsis (a " "comma separated list), overriding the global value from the ή στη γραμμή εντολών. Πρόκειται για προαιρετικό στοιχείο." #. (itstool) path: varlistentry/term -#: C/index.docbook:988 +#: C/index.docbook:999 msgid "@image" msgstr "@image" #. (itstool) path: listitem/para -#: C/index.docbook:990 +#: C/index.docbook:1001 msgid "" "The image to display at the top of the reference page for this section. This " "will often be some sort of a diagram to illustrate the visual appearance of " @@ -1684,7 +1710,7 @@ msgstr "" "καταχώρηση είναι προαιρετική." #. (itstool) path: tip/para -#: C/index.docbook:1001 +#: C/index.docbook:1012 msgid "" "To avoid unnecessary recompilation after doc-changes put the section docs " "into the c-source where possible." @@ -1694,12 +1720,12 @@ msgstr "" "αρχείο του πηγαίου κώδικα, όπου αυτό είναι δυνατό." #. (itstool) path: sect1/title -#: C/index.docbook:1010 +#: C/index.docbook:1021 msgid "Documenting symbols" msgstr "Τεκμηρίωση συμβόλων" #. (itstool) path: sect1/para -#: C/index.docbook:1012 +#: C/index.docbook:1023 msgid "" "Each symbol (function, macro, struct, enum, signal and property) is " "documented in a separate block. The block is best placed close to the " @@ -1708,7 +1734,7 @@ msgid "" "enums in the header file." msgstr "" "Κάθε σύμβολο (συνάρτηση, μακροεντολή, δομή, αρίθμηση, σήμα, ιδιότητα) " -"τεκμηριώνεται σε ξεχωριστό μπλοκ. Η καταλληλότερη θέση για τα μπλοκ είναι " +"τεκμηριώνεται σε ξεχωριστή ομάδα. Η καταλληλότερη θέση για τις ομάδες είναι " "δίπλα στους ορισμούς των συμβόλων, γιατί διευκολύνει το έργο συγχρονισμού. " "Επομένως, η τεκμηρίωση των συναρτήσεων συνήθως βρίσκεται στο αρχείο του " "πηγαίου κώδικα, ενώ των μακροεντολών, δομών και αριθμήσεων στο αρχείο " @@ -1716,12 +1742,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1020 C/index.docbook:1049 +#: C/index.docbook:1031 C/index.docbook:1060 msgid "General tags" msgstr "Γενικές ετικέτες" #. (itstool) path: sect2/para -#: C/index.docbook:1022 +#: C/index.docbook:1033 msgid "" "You can add versioning information to all documentation elements to tell " "when an API was introduced, or when it was deprecated." @@ -1730,27 +1756,27 @@ msgstr "" "τεκμηρίωσης για να πείτε πότε εισήχθηκε ένα API, ή πότε καταργήθηκε." #. (itstool) path: variablelist/title -#: C/index.docbook:1027 +#: C/index.docbook:1038 msgid "Versioning Tags" msgstr "Εκδόσεις Ετικετών" #. (itstool) path: varlistentry/term -#: C/index.docbook:1028 +#: C/index.docbook:1039 msgid "Since:" msgstr "Από:" #. (itstool) path: listitem/para -#: C/index.docbook:1030 +#: C/index.docbook:1041 msgid "Description since which version of the code the API is available." msgstr "Περιγραφή οπό ποια έκδοση του κώδικα και μετά είναι διαθέσιμο το API." #. (itstool) path: varlistentry/term -#: C/index.docbook:1035 +#: C/index.docbook:1046 msgid "Deprecated:" msgstr "Παρωχημένη:" #. (itstool) path: listitem/para -#: C/index.docbook:1037 +#: C/index.docbook:1048 msgid "" "Paragraph denoting that this function should no be used anymore. The " "description should point the reader to the new API." @@ -1759,12 +1785,12 @@ msgstr "" "συνάρτησης. Η περιγραφή θα πρέπει να παραπέμπει τον αναγνώστη στο νέο API." #. (itstool) path: sect2/para -#: C/index.docbook:1045 +#: C/index.docbook:1056 msgid "(FIXME : Stability information)" msgstr "(FIXME : Πληροφορίες σταθερότητας)" #. (itstool) path: example/programlisting -#: C/index.docbook:1050 +#: C/index.docbook:1061 #, no-wrap msgid "" "\n" @@ -1789,12 +1815,12 @@ msgstr "" " * foo_get_bar:\n" " * @foo: some foo\n" " *\n" -" * Ανάκτηση του @foo's bar.\n" +" * Retrieves @foo's bar.\n" " *\n" -" * Επιστρέφει: @foo's bar\n" +" * Returns: @foo's bar\n" " *\n" -" * Από το: 2.6\n" -" * Παρωχημένο: 2.12: Χρησιμοποιείστε το foo_baz_get_bar() στη θέση του.\n" +" * Since: 2.6\n" +" * Deprecated: 2.12: Use foo_baz_get_bar() instead.\n" " */\n" "Bar *\n" "foo_get_bar(Foo *foo)\n" @@ -1803,40 +1829,40 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1070 C/index.docbook:1106 +#: C/index.docbook:1081 C/index.docbook:1117 msgid "Function comment block" -msgstr "Μπλοκ σχολίου συνάρτησης" +msgstr "Ομάδα σχολίων συνάρτησης" #. (itstool) path: listitem/para -#: C/index.docbook:1076 +#: C/index.docbook:1087 msgid "" "Document whether returned objects, lists, strings, etc, should be freed/" "unrefed/released." msgstr "" -"Τεκμηριώσετε κατά πόσο τα επιστρεφόμενα αντικείμενα, λίστες, συμβολοσειρές, " -"κ.λπ, θα πρέπει να ελευθερώνονται, να μην ελευθερώνονται ή να απορρίπτονται." +"Τεκμηριώστε κατά πόσο τα επιστρεφόμενα αντικείμενα, λίστες, συμβολοσειρές, κ." +"λπ, θα πρέπει να ελευθερώνονται, να μην ελευθερώνονται ή να απορρίπτονται." #. (itstool) path: listitem/para -#: C/index.docbook:1082 +#: C/index.docbook:1093 msgid "Document whether parameters can be NULL, and what happens if they are." msgstr "" "Τεκμηριώσετε κατά πόσο οι παράμετροι μπορούν να είναι μηδενικές (NULL) και " "τι συμβαίνει αν είναι." #. (itstool) path: listitem/para -#: C/index.docbook:1087 +#: C/index.docbook:1098 msgid "" "Mention interesting pre-conditions and post-conditions where appropriate." msgstr "" "Αναφέρετε ενδιαφέρουσες προ-καταστάσεις και μετα-καταστάσεις όπου χρειάζεται." #. (itstool) path: sect2/para -#: C/index.docbook:1072 C/index.docbook:1165 +#: C/index.docbook:1083 C/index.docbook:1176 msgid "Please remember to: <_:itemizedlist-1/>" msgstr "Παρακαλούμε να θυμηθείτε να: <_:itemizedlist-1/>" #. (itstool) path: sect2/para -#: C/index.docbook:1094 +#: C/index.docbook:1105 msgid "" "Gtk-doc assumes all symbols (macros, functions) starting with '_' are " "private. They are treated like static functions." @@ -1846,7 +1872,7 @@ msgstr "" "συναρτήσεις." #. (itstool) path: sect2/para -#: C/index.docbook:1099 +#: C/index.docbook:1110 msgid "" "Also, take a look at GObject Introspection annotation tags: http://live." "gnome.org/GObjectIntrospection/Annotations" @@ -1855,7 +1881,7 @@ msgstr "" "gnome.org/GObjectIntrospection/Annotations" #. (itstool) path: example/programlisting -#: C/index.docbook:1107 +#: C/index.docbook:1118 #, no-wrap msgid "" "\n" @@ -1880,61 +1906,60 @@ msgstr "" "\n" "/**\n" " * function_name:\n" -" * @par1: περιγραφή της παραμέτρου 1. Αυτά μπορουν να επεκταθούν επί πολύ περισσότερο από\n" -" * μια γραμμή.\n" -" * @par2: περιγραφή της παραμέτρου 2\n" -" * @...: a %NULL-terminated λίστα γραμμών\n" +" * @par1: description of parameter 1. These can extend over more than\n" +" * one line.\n" +" * @par2: description of parameter 2\n" +" * @...: a %NULL-terminated list of bars\n" " *\n" -" * Η περιγραφή παραμέτρου πηγαίνει εδώ. Μπορείτε να χρησιμοποιήσετε το @par1 για να αναφερθείτε στις παραμέτρους\n" -" * έτσι ώστε να τονίζονται έντονα στην έξοδο. Μπορείτε επίσης να χρησιμοποιήσετε το %constant\n" -" * για τις σταθερές, το function_name2() για τις συναρτήσεις και το #GtkWidget για συνδέσμους σε\n" -" * άλλες δηλώσεις (που μπορεί να τεκμηριώνονται αλλού).\n" +" * The function description goes here. You can use @par1 to refer to parameters\n" +" * so that they are highlighted in the output. You can also use %constant\n" +" * for constants, function_name2() for functions and #GtkWidget for links to\n" +" * other declarations (which may be documented elsewhere).\n" " *\n" -" * Επιστρέφει: έναν ακέραιο.\n" +" * Returns: an integer.\n" " *\n" -" * Από την: 2.2\n" -" * Παρωχημένη: 2.18: Χρησιμοποιήστε αντιθέτως μια άλλη_συνάρτηση().\n" +" * Since: 2.2\n" +" * Deprecated: 2.18: Use other_function() instead.\n" " */\n" -"\n" #. (itstool) path: variablelist/title -#: C/index.docbook:1128 +#: C/index.docbook:1139 msgid "Function tags" msgstr "Ετικέτες συναρτήσεων" #. (itstool) path: varlistentry/term -#: C/index.docbook:1129 +#: C/index.docbook:1140 msgid "Returns:" -msgstr "Returns:" +msgstr "Επιστροφές:" #. (itstool) path: listitem/para -#: C/index.docbook:1131 +#: C/index.docbook:1142 msgid "Paragraph describing the returned result." msgstr "Παράγραφος που περιγράφει το επιστρεφόμενο αποτέλεσμα." #. (itstool) path: varlistentry/term -#: C/index.docbook:1136 +#: C/index.docbook:1147 msgid "@...:" msgstr "@...:" #. (itstool) path: listitem/para -#: C/index.docbook:1138 +#: C/index.docbook:1149 msgid "" "In case the function has variadic arguments, you should use this tag " "(@Varargs: does also work for historic reasons)." msgstr "" -"Σε περίπτωση που η μεταβλητή μπορεί να δεχθεί μεταβλητό αριθμό ορισμάτων " +"Σε περίπτωση που η συνάρτηση μπορεί να δεχθεί μεταβλητό αριθμό ορισμάτων " "(variadic), πρέπει να χρησιμοποιήσετε αυτή την ετικέτα (η ετικέτα @Varargs: " "λειτουργεί επίσης, για ιστορικούς λόγους)." #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1148 C/index.docbook:1150 +#: C/index.docbook:1159 C/index.docbook:1161 msgid "Property comment block" -msgstr "Μπλοκ σχολίου ιδιότητας" +msgstr "Ομάδα σχολίων ιδιότητας" #. (itstool) path: example/programlisting -#: C/index.docbook:1151 +#: C/index.docbook:1162 #, no-wrap msgid "" "\n" @@ -1949,18 +1974,18 @@ msgstr "" "/**\n" " * SomeWidget:some-property:\n" " *\n" -" * Εδώ μπορείτε να τεκμηριώσετε μια ιδιότητα.\n" +" * Here you can document a property.\n" " */\n" "g_object_class_install_property (object_class, PROP_SOME_PROPERTY, ...);\n" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1163 C/index.docbook:1182 +#: C/index.docbook:1174 C/index.docbook:1193 msgid "Signal comment block" -msgstr "Μπλοκ σχολίου σήματος" +msgstr "Ομάδα σχολίων σήματος" #. (itstool) path: listitem/para -#: C/index.docbook:1169 +#: C/index.docbook:1180 msgid "" "Document when the signal is emitted and whether it is emitted before or " "after other signals." @@ -1969,12 +1994,12 @@ msgstr "" "άλλα σήματα." #. (itstool) path: listitem/para -#: C/index.docbook:1175 +#: C/index.docbook:1186 msgid "Document what an application might do in the signal handler." msgstr "Τεκμηριώστε τι μπορεί να κάνει μια εφαρμογή στον διαχειριστή σημάτων." #. (itstool) path: example/programlisting -#: C/index.docbook:1183 +#: C/index.docbook:1194 #, no-wrap msgid "" "\n" @@ -1997,7 +2022,7 @@ msgstr "" " * @foo: some foo\n" " * @bar: some bar\n" " *\n" -" * Το ::foobar-οποιημένο σήμα εκπέμπεται κάθε φορά που κάποιος προσπαθεί να foobar-οποιήσει το @widget.\n" +" * The ::foobarized signal is emitted each time someone tries to foobarize @widget.\n" " */\n" "foo_signals[FOOBARIZE] =\n" " g_signal_new (\"foobarize\",\n" @@ -2005,12 +2030,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1200 C/index.docbook:1201 +#: C/index.docbook:1211 C/index.docbook:1212 msgid "Struct comment block" -msgstr "Μπλοκ σχολίου δομής" +msgstr "Ομάδα σχολίων δομής" #. (itstool) path: example/programlisting -#: C/index.docbook:1202 +#: C/index.docbook:1213 #, no-wrap msgid "" "\n" @@ -2033,7 +2058,7 @@ msgstr "" " * FooWidget:\n" " * @bar: some #gboolean\n" " *\n" -" * Αυτό είναι το καλύτερο widget που υπήρξε ποτέ.\n" +" * This is the best widget, ever.\n" " */\n" "typedef struct _FooWidget {\n" " /*< private >*/\n" @@ -2044,7 +2069,7 @@ msgstr "" "} FooWidget;\n" #. (itstool) path: sect2/para -#: C/index.docbook:1219 +#: C/index.docbook:1230 msgid "" "Use /*< private >*/ before the private struct fields you " "want to hide. Use /*< public >*/ for the reverse " @@ -2055,7 +2080,7 @@ msgstr "" "public >*/για την αντίστροφη συμπεριφορά." #. (itstool) path: sect2/para -#: C/index.docbook:1225 +#: C/index.docbook:1236 msgid "" "Struct comment blocks can also be used for GObjects and GObjectClasses. It " "is usually a good idea to add a comment block for a class, if it has " @@ -2065,7 +2090,7 @@ msgid "" "here is that this creates two index entries of the same name (the structure " "and the section)." msgstr "" -"Οι ομάδες σχολίων μιας Δομής μπορούν επίσης να χρησιμοποιηθούν για GObjects " +"Οι ομάδες σχολίων μιας δομής μπορούν επίσης να χρησιμοποιηθούν για GObjects " "και για GObjectClasses. Είναι συνήθως καλή ιδέα να προσθέτετε μία ομάδα " "σχολίου για μια κλάση, εάν έχει vmethods (γιατί έτσι μπορούν να " "τεκμηριωθούν). Για το ίδιο το GObject μπορείτε να χρησιμοποιήσετε τα σχετικά " @@ -2076,12 +2101,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1237 C/index.docbook:1238 +#: C/index.docbook:1248 C/index.docbook:1249 msgid "Enum comment block" -msgstr "Μπλοκ σχολίου Enum" +msgstr "Ομάδα σχολίων Enum" #. (itstool) path: example/programlisting -#: C/index.docbook:1239 +#: C/index.docbook:1250 #, no-wrap msgid "" "\n" @@ -2105,17 +2130,17 @@ msgstr "" " * @SOMETHING_FOO: something foo\n" " * @SOMETHING_BAR: something bar\n" " *\n" -" * Τιμές απαρίθμησης που χρησιμοποιούνται για το πράγμα, για τον ορισμό του πράγματος.\n" +" * Enum values used for the thing, to specify the thing.\n" " */\n" "typedef enum {\n" " SOMETHING_FOO,\n" " SOMETHING_BAR,\n" " /*< private >*/\n" " SOMETHING_COUNT\n" -"} Something·\n" +"} Something;\n" #. (itstool) path: sect2/para -#: C/index.docbook:1256 +#: C/index.docbook:1267 msgid "" "Use /*< private >*/ before the private enum values you " "want to hide. Use /*< public >*/ for the reverse " @@ -2126,12 +2151,12 @@ msgstr "" ">*/ για την αντίστροφη συμπεριφορά." #. (itstool) path: sect1/title -#: C/index.docbook:1266 +#: C/index.docbook:1277 msgid "Useful DocBook tags" msgstr "Χρήσιμες ετικέτες DocBook" #. (itstool) path: sect1/para -#: C/index.docbook:1268 +#: C/index.docbook:1279 msgid "" "Here are some DocBook tags which are most useful when documenting the code." msgstr "" @@ -2139,7 +2164,7 @@ msgstr "" "του κώδικα." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1277 +#: C/index.docbook:1288 #, no-wrap msgid "" "\n" @@ -2149,7 +2174,7 @@ msgstr "" "<link linkend=\"glib-Hash-Tables\">Hash Tables</link>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1273 +#: C/index.docbook:1284 msgid "" "To link to another section in the GTK docs: <_:informalexample-1/> The " "linkend is the SGML/XML id on the top item of the page you want to link to. " @@ -2158,15 +2183,15 @@ msgid "" "name. Spaces and underscores are converted to '-' to conform to SGML/XML." msgstr "" "Για να συνδεθείτε με μια άλλη ενότητα στην τεκμηρίωση GTK: <_:" -"informalexample-1/> Ο προορισμός είναι το id του SGML/XML στο πρώτο στοιχείο " -"της σελίδας στην οποία παραπέμπει ο σύνδεσμος. Για τις περισσότερες σελίδες " -"είναι το (\"gtk\", \"gdk\", glib\"), ακολουθούμενο από τον τίτλο της σελίδας " -"(«Πίνακες Hash»). Για τα γραφικά συστατικά είναι το όνομα της κλάσης. Τα " -"διαστήματα και τα «_» μετατρέπονται σε «-» για να υπάρχει συμμόρφωση με το " -"SGML/XML." +"informalexample-1/> Ο προορισμός είναι το αναγνωριστικό του SGML/XML στο " +"πρώτο στοιχείο της σελίδας στην οποία παραπέμπει ο σύνδεσμος. Για τις " +"περισσότερες σελίδες είναι το (\"gtk\", \"gdk\", glib\"), ακολουθούμενο από " +"τον τίτλο της σελίδας (\"Πίνακες Hash\"). Για τα γραφικά συστατικά είναι το " +"όνομα της κλάσης. Τα διαστήματα και τα «_» μετατρέπονται σε «-» για να " +"υπάρχει συμμόρφωση με το SGML/XML." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1290 +#: C/index.docbook:1301 #, no-wrap msgid "" "\n" @@ -2176,7 +2201,7 @@ msgstr "" "<function>...</function>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1287 +#: C/index.docbook:1298 msgid "" "To refer to an external function, e.g. a standard C function: <_:" "informalexample-1/>" @@ -2185,7 +2210,7 @@ msgstr "" "informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1299 +#: C/index.docbook:1310 #, no-wrap msgid "" "\n" @@ -2198,14 +2223,14 @@ msgid "" msgstr "" "\n" "<example>\n" -" <title>Χρησιμοποιώντας έναν πίνακα GHashTable.</title>\n" +" <title>Using a GHashTable.</title>\n" " <programlisting>\n" " ...\n" " </programlisting>\n" "</example>\n" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1310 +#: C/index.docbook:1321 #, no-wrap msgid "" "\n" @@ -2223,7 +2248,7 @@ msgstr "" "</informalexample>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1296 +#: C/index.docbook:1307 msgid "" "To include example code: <_:informalexample-1/> or possibly this, for very " "short code fragments which don't need a title: <_:informalexample-2/> For " @@ -2231,10 +2256,10 @@ msgid "" msgstr "" "Συμπερίληψη παραδειγμάτων κώδικα: <_:informalexample-1/> ή, ενδεχομένως, για " "πολύ σύντομο κώδικα που δεν χρειάζεται τίτλο: <_:informalexample-2/>. Στην " -"τελευταία περίπτωση το GTK-Doc υποστηρίζει επίσης τη σύντμηση: |[ ... ]|" +"τελευταία περίπτωση το GTK-Doc υποστηρίζει επίσης μια συντόμευση: |[ ... ]|" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1329 +#: C/index.docbook:1340 #, no-wrap msgid "" "\n" @@ -2266,12 +2291,12 @@ msgstr "" "</itemizedlist>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1326 +#: C/index.docbook:1337 msgid "To include bulleted lists: <_:informalexample-1/>" -msgstr "Συμπερίληψη λιστών με κουκίδες: <_:informalexample-1/>" +msgstr "Συμπερίληψη λιστών με κουκκίδες: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1349 +#: C/index.docbook:1360 #, no-wrap msgid "" "\n" @@ -2284,12 +2309,12 @@ msgstr "" "\n" "<note>\n" " <para>\n" -" Βεβαιωθείτε πως απελυεθερώνετε τα δεδομένα μετά τη χρήση.\n" +" Make sure you free the data after use.\n" " </para>\n" "</note>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1346 +#: C/index.docbook:1357 msgid "" "To include a note which stands out from the text: <_:informalexample-1/>" msgstr "" @@ -2297,22 +2322,22 @@ msgstr "" "informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1362 +#: C/index.docbook:1373 #, no-wrap msgid "" "\n" "<type>unsigned char</type>\n" msgstr "" "\n" -"<type>μη υπογεγραμμένος χαρακτήρας char</type>\n" +"<type>unsigned char</type>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1359 +#: C/index.docbook:1370 msgid "To refer to a type: <_:informalexample-1/>" msgstr "Για να αναφερθείτε σε έναν τύπο: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1371 +#: C/index.docbook:1382 #, no-wrap msgid "" "\n" @@ -2322,7 +2347,7 @@ msgstr "" "<structname>XFontStruct</structname>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1368 +#: C/index.docbook:1379 msgid "" "To refer to an external structure (not one described in the GTK docs): <_:" "informalexample-1/>" @@ -2331,7 +2356,7 @@ msgstr "" "τεκμηρίωση GTK): <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1380 +#: C/index.docbook:1391 #, no-wrap msgid "" "\n" @@ -2341,12 +2366,12 @@ msgstr "" "<structfield>len</structfield>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1377 +#: C/index.docbook:1388 msgid "To refer to a field of a structure: <_:informalexample-1/>" msgstr "Για να αναφερθείτε σε ένα πεδίο μιας δομής: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1389 +#: C/index.docbook:1400 #, no-wrap msgid "" "\n" @@ -2356,7 +2381,7 @@ msgstr "" "<classname>GtkWidget</classname>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1386 +#: C/index.docbook:1397 msgid "" "To refer to a class name, we could possibly use: <_:informalexample-1/> but " "you'll probably be using #GtkWidget instead (to automatically create a link " @@ -2366,25 +2391,25 @@ msgstr "" "Για να αναφερθείτε σε ένα όνομα κλάσης, θα μπορούσατε να χρησιμοποιήσετε " "το : <_:informalexample-1/>, αλλά μάλλον θα χρησιμοποιήσετε το #GtkWidget " "(για αυτόματη δημιουργία συνδέσμου προς τη σελίδα GtkWidget, δείτε τις συντμήσεις)." +"linkend=\"documenting_syntax\">τις συντομεύσεις)." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1400 +#: C/index.docbook:1411 #, no-wrap msgid "" "\n" "<emphasis>This is important</emphasis>\n" msgstr "" "\n" -"<emphasis>Αυτό είναι σημαντικό;/emphasis>\n" +"<emphasis>This is important</emphasis>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1397 +#: C/index.docbook:1408 msgid "To emphasize text: <_:informalexample-1/>" msgstr "Χρήση έντονων χαρακτήρων: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1409 +#: C/index.docbook:1420 #, no-wrap msgid "" "\n" @@ -2394,12 +2419,12 @@ msgstr "" "<filename>/home/user/documents</filename>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1406 +#: C/index.docbook:1417 msgid "For filenames use: <_:informalexample-1/>" msgstr "Για ονόματα αρχείων χρησιμοποιήστε: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1418 +#: C/index.docbook:1429 #, no-wrap msgid "" "\n" @@ -2409,17 +2434,17 @@ msgstr "" "<keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1415 +#: C/index.docbook:1426 msgid "To refer to keys use: <_:informalexample-1/>" msgstr "Για να αναφερθείτε σε κλειδιά χρησιμοποιήστε: <_:informalexample-1/>" #. (itstool) path: chapter/title -#: C/index.docbook:1428 +#: C/index.docbook:1439 msgid "Filling the extra files" msgstr "Συμπλήρωση των επιπλέον αρχείων" #. (itstool) path: chapter/para -#: C/index.docbook:1430 +#: C/index.docbook:1441 msgid "" "There are a couple of extra files, that need to be maintained along with the " "inline source code comments: <package>.types, " @@ -2432,12 +2457,12 @@ msgstr "" "sgml), <package>-sections.txt." #. (itstool) path: sect1/title -#: C/index.docbook:1439 +#: C/index.docbook:1450 msgid "Editing the types file" msgstr "Επεξεργασία του αρχείου types" #. (itstool) path: sect1/para -#: C/index.docbook:1441 +#: C/index.docbook:1452 msgid "" "If your library or application includes GObjects, you want their signals, " "arguments/parameters and position in the hierarchy to be shown in the " @@ -2452,12 +2477,12 @@ msgstr "" "<package>.types." #. (itstool) path: example/title -#: C/index.docbook:1450 +#: C/index.docbook:1461 msgid "Example types file snippet" msgstr "Υπόδειγμα αποσπάσματος αρχείου types" #. (itstool) path: example/programlisting -#: C/index.docbook:1451 +#: C/index.docbook:1462 #, no-wrap msgid "" "\n" @@ -2477,7 +2502,7 @@ msgstr "" "gtk_arrow_get_type\n" #. (itstool) path: sect1/para -#: C/index.docbook:1462 +#: C/index.docbook:1473 msgid "" "Since GTK-Doc 1.8 gtkdoc-scan can generate this " "list for you. Just add \"--rebuild-types\" to SCAN_OPTIONS in " @@ -2485,18 +2510,18 @@ msgid "" "dist the types file nor have it under version control." msgstr "" "Από την έκδοση 1.8 και μετά το gtkdoc-scan μπορεί " -"να παράγει αυτόματα αυτή τη λίστα. Απλά προσθέστε την επιλογή «--rebuild-" -"types» στο SCAN_OPTIONS του Makefile.am. Αν προτιμήσετε " -"αυτή την προσέγγιση, θα πρέπει να μη συμπεριλάβετε το αρχείο types ούτε στη " -"διανομή ούτε στον έλεγχο εκδόσεων." +"να παράγει αυτόματα αυτή τη λίστα. Απλά προσθέστε την επιλογή \"--rebuild-" +"types\" στο SCAN_OPTIONS του Makefile.am. Αν " +"προτιμήσετε αυτή την προσέγγιση, θα πρέπει να μη συμπεριλάβετε το αρχείο " +"types ούτε στη διανομή ούτε στον έλεγχο εκδόσεων." #. (itstool) path: sect1/title -#: C/index.docbook:1471 +#: C/index.docbook:1482 msgid "Editing the master document" msgstr "Επεξεργασία κύριου εγγράφου (master)" #. (itstool) path: sect1/para -#: C/index.docbook:1473 +#: C/index.docbook:1484 msgid "" "GTK-Doc produces documentation in DocBook SGML/XML. When processing the " "inline source comments, the GTK-Doc tools generate one documentation page " @@ -2510,7 +2535,7 @@ msgstr "" "ταξινομεί." #. (itstool) path: sect1/para -#: C/index.docbook:1480 +#: C/index.docbook:1491 msgid "" "While GTK-Doc creates a template master document for you, later run will not " "touch it again. This means that one can freely structure the documentation. " @@ -2528,7 +2553,7 @@ msgstr "" "προστεθεί νέα στοιχεία." #. (itstool) path: tip/para -#: C/index.docbook:1490 +#: C/index.docbook:1501 msgid "" "Do not create tutorials as extra documents. Just write extra chapters. The " "benefit of directly embedding the tutorial for your library into the API " @@ -2536,31 +2561,30 @@ msgid "" "documentation. Apart chances are higher that the tutorial gets updates along " "with the library." msgstr "" -"Μη δημιουργείτε νέα έγγραφα για τους οδηγούς εκμάθησης (tutorials). Απλά " -"προσθέστε τους ως επιπλέον κεφάλαια, δηλαδή ενσωματώστε απευθείας τον οδηγό " -"εκμάθησης για μια βιβλιοθήκη στην τεκμηρίωση API. Το πλεονέκτημα είναι ότι " -"έτσι διευκολύνεται η διαδικασία δημιουργίας συνδέσμων από τον οδηγό " -"εκμάθησης προς την τεκμηρίωση των συμβόλων. Επίσης, έτσι καθίσταται " -"πιθανότερη η ενημέρωση του οδηγού μαζί με τη βιβλιοθήκη." +"Μη δημιουργείτε εγχειρίδια ως νέα έγγραφα. Απλά προσθέστε επιπλέον κεφάλαια. " +"Το όφελος της ενσωμάτωσης απευθείας του εγχειριδίου για μια βιβλιοθήκη στην " +"τεκμηρίωση API είναι ότι έτσι διευκολύνεται η διαδικασία δημιουργίας " +"συνδέσμων από το εγχειρίδιο προς την τεκμηρίωση των συμβόλων. Επίσης, έτσι " +"καθίσταται πιθανότερη η ενημέρωση του εγχειριδίου μαζί με τη βιβλιοθήκη." #. (itstool) path: sect1/para -#: C/index.docbook:1499 +#: C/index.docbook:1510 msgid "" "So what are the things to change inside the master document? For a start is " "only a little. There are some placeholders (text in square brackets) there " "which you should take care of." msgstr "" "Ποιες είναι λοιπόν οι αλλαγές που πρέπει να γίνουν στο κύριο έγγραφο; " -"Διευκρινίζουμε ότι πρόκειται για λίγες μόνο αλλαγές σε ορισμένα placeholders " -"(κείμενα εντός αγκυλών)." +"Πρόκειται για λίγες μόνο αλλαγές σε ορισμένα placeholders (κείμενα εντός " +"αγκυλών) που πρέπει να διευκρινήσετε." #. (itstool) path: example/title -#: C/index.docbook:1506 +#: C/index.docbook:1517 msgid "Master document header" msgstr "Κεφαλίδα κύριου εγγράφου" #. (itstool) path: example/programlisting -#: C/index.docbook:1507 +#: C/index.docbook:1518 #, no-wrap msgid "" "\n" @@ -2578,10 +2602,10 @@ msgid "" msgstr "" "\n" "<bookinfo>\n" -" <title>MODULENAME Εγχειρίδιο αναφοράς;/title>\n" +" <title>MODULENAME Reference Manual</title>\n" " <releaseinfo>\n" -" για το MODULENAME [ΕΚΔΟΣΗ]\n" -" Η πιο πρόσφατη έκδοση αυτή της τεκμηρίωσης μπορούν να εντοπισθούν on-line στη διεύθυνση\n" +" for MODULENAME [VERSION]\n" +" The latest version of this documentation can be found on-line at\n" " <ulink role=\"online-location\" url=\"http://[SERVER]/MODULENAME/index.html\">http://[SERVER]/MODULENAME/</ulink>.\n" " </releaseinfo>\n" "</bookinfo>\n" @@ -2590,12 +2614,12 @@ msgstr "" " <title>[Insert title here]</title>\n" #. (itstool) path: sect1/title -#: C/index.docbook:1526 +#: C/index.docbook:1537 msgid "Editing the section file" msgstr "Επεξεργασία αρχείου ενοτήτων" #. (itstool) path: sect1/para -#: C/index.docbook:1528 +#: C/index.docbook:1539 msgid "" "The section file is used to organise the documentation output by GTK-Doc. " "Here one specifies which symbol belongs to which module or class and control " @@ -2606,7 +2630,7 @@ msgstr "" "σύμβολο και αποφασίζεται η ορατότητά του (αν θα είναι δημόσιο ή ιδιωτικό)." #. (itstool) path: sect1/para -#: C/index.docbook:1534 +#: C/index.docbook:1545 msgid "" "The section file is a plain text file with XML-like syntax (using tags). " "Blank lines are ignored and lines starting with a '#' are treated as comment " @@ -2617,7 +2641,7 @@ msgstr "" "που ξεκινούν με '#' αντιμετωπίζονται ως γραμμές σχολίων." #. (itstool) path: sect1/para -#: C/index.docbook:1540 +#: C/index.docbook:1551 msgid "" "The <FILE> ... </FILE> tag is used to specify the file name, " "without any suffix. For example, using '<FILE>gnome-config</" @@ -2640,7 +2664,7 @@ msgstr "" "GObjects που μετατράπηκε σε πεζά γράμματα)." #. (itstool) path: sect1/para -#: C/index.docbook:1552 +#: C/index.docbook:1563 msgid "" "The <TITLE> ... </TITLE> tag is used to specify the title of the " "section. It is only useful before the templates (if used) are initially " @@ -2651,10 +2675,10 @@ msgstr "" "τους τίτλους των ενοτήτων. Χρησιμεύει μόνο πριν τη δημιουργία των προτύπων, " "καθώς ο τίτλος που περιέχεται στα αρχεία προτύπων αντικαθιστά αυτούς τους " "τίτλους. Επίσης, αν χρησιμοποιείται το σχόλιο SECTION στον πηγαίο κώδικα, " -"αυτό είναι πεπαλαιωμένο." +"αυτό είναι παρωχημένο." #. (itstool) path: sect1/para -#: C/index.docbook:1559 +#: C/index.docbook:1570 msgid "" "You can group items in the section by using the <SUBSECTION> tag. " "Currently it outputs a blank line between subsections in the synopsis " @@ -2686,7 +2710,7 @@ msgstr "" "(μεταβλητές,vmethods)." #. (itstool) path: sect1/para -#: C/index.docbook:1578 +#: C/index.docbook:1589 msgid "" "You can also use <INCLUDE> ... </INCLUDE> to specify the " "#include files which are shown in the synopsis sections. It contains a comma-" @@ -2703,12 +2727,12 @@ msgstr "" "μόνο τη συγκεκριμένη ενότητα. " #. (itstool) path: chapter/title -#: C/index.docbook:1592 +#: C/index.docbook:1603 msgid "Controlling the result" msgstr "Έλεγχος αποτελέσματος" #. (itstool) path: chapter/para -#: C/index.docbook:1594 +#: C/index.docbook:1605 msgid "" "A GTK-Doc run generates report files inside the documentation directory. The " "generated files are named: <package>-undocumented.txt. Είναι αρχεία απλού κειμένου, εύκολα στην ανάγνωση και επεξεργασία." #. (itstool) path: chapter/para -#: C/index.docbook:1603 +#: C/index.docbook:1614 msgid "" "The <package>-undocumented.txt file starts with " "the documentation coverage summary. Below are two sections divided by blank " @@ -2740,7 +2764,7 @@ msgstr "" "προστέθηκε μια νέα παράμετρος." #. (itstool) path: chapter/para -#: C/index.docbook:1612 +#: C/index.docbook:1623 msgid "" "The <package>-undeclared.txt file lists symbols " "given in the <package>-sections.txt but not found " @@ -2752,7 +2776,7 @@ msgstr "" "έχουν αφαιρεθεί ή αν περιέχουν συντακτικά λάθη." #. (itstool) path: chapter/para -#: C/index.docbook:1619 +#: C/index.docbook:1630 msgid "" "The <package>-unused.txt file lists symbol names, " "where the GTK-Doc scanner has found documentation, but does not know where " @@ -2765,19 +2789,19 @@ msgstr "" "προστεθεί ακόμη στο αρχείο <package>-sections.txt." #. (itstool) path: tip/para -#: C/index.docbook:1627 +#: C/index.docbook:1638 msgid "" "Enable or add the line in Makefile." "am. If at least GTK-Doc 1.9 is installed, this will run sanity checks during " "make check run." msgstr "" "Ενεργοποιήστε ή προσθέστε τη γραμμή " -"στο Makefile.am. Αν έχετε εγκατεστημένη την έκδοση 1.9 ή μεταγενέστερη, θα " -"πραγματοποιεί διάφορους ελέγχους κατά την εκτέλεση του make check." +"στο Makefile.am. Αν έχετε εγκατεστημένη την έκδοση GTK-Doc 1.9 ή " +"μεταγενέστερη, θα πραγματοποιεί διάφορους ελέγχους κατά την εκτέλεση του " +"make check." #. (itstool) path: chapter/para -#: C/index.docbook:1634 +#: C/index.docbook:1645 msgid "" "One can also look at the files produced by the source code scanner: " "<package>-decl-list.txt and <" @@ -2794,7 +2818,7 @@ msgstr "" "περιέχεται σε αυτό το αρχείο." #. (itstool) path: chapter/para -#: C/index.docbook:1643 +#: C/index.docbook:1654 msgid "" "If the project is GObject based, one can also look into the files produced " "by the object scanner: <package>.args.txt, " @@ -2816,27 +2840,27 @@ msgstr "" "GTK_DOC_KEEP_INTERMEDIATE=1 make." #. (itstool) path: chapter/title -#: C/index.docbook:1658 +#: C/index.docbook:1669 msgid "Modernizing the documentation" msgstr "Εκσυγχρονίζοντας την τεκμηρίωση" #. (itstool) path: chapter/para -#: C/index.docbook:1660 +#: C/index.docbook:1671 msgid "" "GTK-Doc has been around for quite some time. In this section we list new " "features together with the version since when it is available." msgstr "" "Το GTK-Doc κυκλοφορεί εδώ και αρκετό καιρό. Σε αυτό το κεφάλαιο θα " -"παραθέσουμε τα νέα χαρακτηρηστικά μαζί με την έκδοση στην οποία είναι " -"διαθέσιμα." +"παραθέσουμε τις νέες λειτουργίες μαζί με την έκδοση στην οποία είναι " +"διαθέσιμες." #. (itstool) path: sect1/title -#: C/index.docbook:1666 +#: C/index.docbook:1677 msgid "GTK-Doc 1.9" msgstr "GTK-Doc 1.9" #. (itstool) path: sect1/para -#: C/index.docbook:1668 +#: C/index.docbook:1679 msgid "" "When using xml instead of sgml, one can actually name the master document " "<package>-docs.xml." @@ -2845,7 +2869,7 @@ msgstr "" "το κύριο έγγραφο <package>-docs.xml." #. (itstool) path: sect1/para -#: C/index.docbook:1673 +#: C/index.docbook:1684 msgid "" "This version supports in " "Makefile.am. When this is enabled, the <" @@ -2859,15 +2883,15 @@ msgstr "" "Αυτή η έκδοση υποστηρίζει " "στο Makefile.am. Αν αυτό ενεργοποιηθεί, το " "<package>-sections.txt αυτοδημιουργείται και " -"μπορεί να αφαιρεθεί από το vcs. Αυτό λειτουργεί ωραία μόνο για έργα που " -"έχουν μια πολύ κανονική δομή (π.χ. το κάθε ζεύγος .{c,h} θα δημιουργεί μια " -"νέα ενότητα). Αν κάποιος οργανώσει ένα έργο κοντά σε αυτό, τότε η ενημέρωση " -"μιας ενότητας αρείων που συντηρούνται χειρονακτικά μπορεί να είναι τόσο απλή " -"όσο και το να εκτελούμε meld <package>-decl-list.txt <" -"package>-sections.txt." +"μπορεί να αφαιρεθεί από το vcs. Αυτό λειτουργεί καλά μόνο για έργα που έχουν " +"μια πολύ κανονική δομή (π.χ. το κάθε ζεύγος .{c,h} θα δημιουργεί μια νέα " +"ενότητα). Αν κάποιος οργανώσει ένα έργο κοντά σε αυτό, τότε η ενημέρωση μιας " +"ενότητας αρχείων που συντηρούνται χειρονακτικά μπορεί να είναι τόσο απλή όσο " +"και το να εκτελούμε meld <package>-decl-list.txt <package>-" +"sections.txt." #. (itstool) path: sect1/para -#: C/index.docbook:1684 +#: C/index.docbook:1695 msgid "" "Version 1.8 already introduced the syntax for documenting sections in the " "sources instead of the separate files under tmpl. Αυτή η έκδοση προσθέτει επιλογές για τη μετατροπή " "ολόκληρου του αρθρώματος doc ώστε να μη χρησιμοποιεί καθόλου το επιπλέον " -"στάδιο tmpl build, με τη χρήση της επιλογής in " "Makefile.am. When this is enabled, the <" @@ -2900,22 +2924,22 @@ msgstr "" "Αυτή η έκδοση υποστηρίζει τα " "στο Makefile.am. Αν αυτό ενεργοποιηθεί, το " "<package>.types αυτοδημιουργείται και μπορεί να " -"αφαιρεθεί από το vcs. Όταν χρησιμοποιείτε αυτό το χαρακτηριστικό είναι " -"σημαντικό να ρυθμίσετε και το IGNORE_HFILES στο " -"Makefile.am για τον κώδικα που δημιουργείται υπό όρους." +"αφαιρεθεί από το vcs. Όταν χρησιμοποιείτε αυτή τη λειτουργία είναι σημαντικό " +"να ρυθμίσετε και το IGNORE_HFILES στο Makefile." +"am για τον κώδικα που δομείται υπό όρους." #. (itstool) path: sect1/title -#: C/index.docbook:1707 +#: C/index.docbook:1718 msgid "GTK-Doc 1.16" msgstr "GTK-Doc 1.16" #. (itstool) path: example/title -#: C/index.docbook:1713 +#: C/index.docbook:1724 msgid "Enable gtkdoc-check" msgstr "Ενεργοποίηση του gtkdoc-check" #. (itstool) path: example/programlisting -#: C/index.docbook:1714 +#: C/index.docbook:1725 #, no-wrap msgid "" "\n" @@ -2935,24 +2959,24 @@ msgstr "" "endif\n" #. (itstool) path: sect1/para -#: C/index.docbook:1709 +#: C/index.docbook:1720 msgid "" "This version includes a new tool called gtkdoc-check. This tool can run a " "set of sanity checks on your documentation. It is enabled by adding these " "lines to the end of Makefile.am. <_:example-1/>" msgstr "" "Αυτή η έκδοση περιλαμβάνει ένα νέο εργαλείο που λέγεται gtkdoc-check. Αυτό " -"το εργαλείο μπορέι να εκτελεί ένα σύνολο ελέγχων υγείας στην τεκμηρίωσή σας. " +"το εργαλείο μπορέι να εκτελεί ένα σύνολο ελέγχων στην τεκμηρίωσή σας. " "Ενεργοποιείται προσθέτοντας αυτές τις γραμμές στο τέλος του " "Makefile.am. <_:example-1/>" #. (itstool) path: sect1/title -#: C/index.docbook:1727 +#: C/index.docbook:1738 msgid "GTK-Doc 1.20" msgstr "GTK-Doc 1.20" #. (itstool) path: sect1/para -#: C/index.docbook:1729 +#: C/index.docbook:1740 msgid "" "Version 1.18 brought some initial markdown support. Using markdown in doc " "comments is less intrusive than writing docbook xml. This version improves a " @@ -2961,17 +2985,17 @@ msgid "" msgstr "" "Η έκδοση 1.18 έφερε μια αρχική υποστήριξη για το markdown. Η χρήση markdown " "στα σχόλια του doc είναι λιγότερο ενοχλητική από το να γράφει κανείς docbook " -"xml. Αυτή η έκδοση επιφέρει μεγάλες βελτιώσεις σε αυτό, και σε πολλές άλλες " -"τεχνοτροπίες (styles). Η ενότητα που εξηγεί τη σύνταξη σχολίων έχει όλες τις λεπτομέρειες." +"xml. Αυτή η έκδοση επιφέρει μεγάλες βελτιώσεις σε αυτό και προσθέτει " +"περισσότερα στυλ. Η ενότητα που εξηγεί τη σύνταξη σχολίων έχει όλες τις λεπτομέρειες." #. (itstool) path: chapter/title -#: C/index.docbook:1740 +#: C/index.docbook:1751 msgid "Documenting other interfaces" msgstr "Τεκμηρίωση άλλων διεπαφών" #. (itstool) path: chapter/para -#: C/index.docbook:1742 +#: C/index.docbook:1753 msgid "" "So far we have been using GTK-Doc to document the API of code. The next " "sections contain suggestions how the tools can be used to document other " @@ -2979,15 +3003,15 @@ msgid "" msgstr "" "Μέχρ τώρα, χρησιμοποιούσαμε το GTK-Doc για να καταγράφουμε το API του " "κώδικα. Οι επόμενες συνεδρίες περιέχουν προτάσεις για το πώς τα εργαλεία " -"μπορούν να χρησιμοποιηθούν για να καταγράφετε και άλλες επιφάνειες." +"μπορούν να χρησιμοποιηθούν για να καταγράφετε και άλλες διεπαφές." #. (itstool) path: sect1/title -#: C/index.docbook:1749 +#: C/index.docbook:1760 msgid "Command line options and man pages" msgstr "Επιλογές γραμμής εντολών και σελίδες τεκμηρίωσης man" #. (itstool) path: sect1/para -#: C/index.docbook:1751 +#: C/index.docbook:1762 msgid "" "As one can generate man pages for a docbook refentry as well, it sounds like " "a good idea to use it for that purpose. This way the interface is part of " @@ -2995,16 +3019,16 @@ msgid "" msgstr "" "Δεδομένου ότι κάποιος μπορεί να παραγάγει σελίδες man για ένα docbook " "refentry επίσης, θα ήταν καλή ιδέα να χρησιμοποιηθεί και για αυτόν τον " -"σκοπό. Με αυτόν τον τρόπο η διεπαφή γίνεται μέρος της αναφοράς και αποχτά " -"την σελίδα-man δωρεάν." +"σκοπό. Με αυτόν τον τρόπο η διεπαφή γίνεται μέρος της αναφοράς και αποκτά " +"δωρεάν την σελίδα-man." #. (itstool) path: sect2/title -#: C/index.docbook:1758 +#: C/index.docbook:1769 msgid "Document the tool" msgstr "Τεκμηρίωση του εργαλείου" #. (itstool) path: sect2/para -#: C/index.docbook:1760 +#: C/index.docbook:1771 msgid "" "Create one refentry file per tool. Following our example we would call it meep/" @@ -3019,17 +3043,17 @@ msgstr "" "αρχείο στον υποκατάλογο xml καθώς επίσης και τα παραδείγματα π.χ. στο glib." #. (itstool) path: sect2/title -#: C/index.docbook:1770 +#: C/index.docbook:1781 msgid "Adding the extra configure check" msgstr "Προσθήκη του έξτρα ελέγχου διαμόρφωσης" #. (itstool) path: example/title -#: C/index.docbook:1773 C/index.docbook:1791 +#: C/index.docbook:1784 C/index.docbook:1802 msgid "Extra configure checks" -msgstr "Έξτρα έλεγχοι διαμόρφωσης" +msgstr "Επιπλέον έλεγχοι ρυθμίσεων" #. (itstool) path: example/programlisting -#: C/index.docbook:1774 +#: C/index.docbook:1785 #, no-wrap msgid "" "\n" @@ -3044,19 +3068,19 @@ msgstr "" "\n" "AC_ARG_ENABLE(man,\n" " [AC_HELP_STRING([--enable-man],\n" -" [αναδημιουργία σελίδων βοήθειας man από το Docbook [default=no]])],enable_man=yes,\n" +" [regenerate man pages from Docbook [default=no]])],enable_man=yes,\n" " enable_man=no)\n" "\n" "AC_PATH_PROG([XSLTPROC], [xsltproc])\n" "AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)\n" #. (itstool) path: sect2/title -#: C/index.docbook:1788 +#: C/index.docbook:1799 msgid "Adding the extra makefile rules" msgstr "Προσθήκη των επιπλέον κανόνων makefile" #. (itstool) path: example/programlisting -#: C/index.docbook:1792 +#: C/index.docbook:1803 #, no-wrap msgid "" "\n" @@ -3092,12 +3116,12 @@ msgstr "" "EXTRA_DIST += meep.xml\n" #. (itstool) path: sect1/title -#: C/index.docbook:1814 +#: C/index.docbook:1825 msgid "DBus interfaces" msgstr "Διεπαφές DBus" #. (itstool) path: sect1/para -#: C/index.docbook:1816 +#: C/index.docbook:1827 msgid "" "(FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://" "cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)" @@ -3106,27 +3130,27 @@ msgstr "" "cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)" #. (itstool) path: chapter/title -#: C/index.docbook:1825 +#: C/index.docbook:1836 msgid "Frequently asked questions" msgstr "Συχνές ερωτήσεις" #. (itstool) path: segmentedlist/segtitle -#: C/index.docbook:1829 +#: C/index.docbook:1840 msgid "Question" msgstr "Ερώτηση" #. (itstool) path: segmentedlist/segtitle -#: C/index.docbook:1830 +#: C/index.docbook:1841 msgid "Answer" msgstr "Απάντηση" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1832 +#: C/index.docbook:1843 msgid "No class hierarchy." msgstr "Δεν υπάρχει ιεραρχία κλάσεων." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1833 +#: C/index.docbook:1844 msgid "" "The objects xxx_get_type() function has not been " "entered into the <package>.types file." @@ -3135,12 +3159,12 @@ msgstr "" "εισαχθεί στο αρχείο <package>.types" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1839 +#: C/index.docbook:1850 msgid "Still no class hierarchy." msgstr "Εξακολουθεί να μην υπάρχει ιεραρχία κλάσεων." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1840 +#: C/index.docbook:1851 msgid "" "Missing or wrong naming in <package>-sections.txt " "file (see αιτιολόγηση)." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1846 +#: C/index.docbook:1857 msgid "Damn, I have still no class hierarchy." msgstr "Στο καλό του, πάλι δεν έχω ιεραρχία κλάσεων." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1847 +#: C/index.docbook:1858 msgid "" "Is the object name (name of the instance struct, e.g. GtkWidget) part of the normal section (don't put this into Standard or Private " @@ -3168,12 +3192,12 @@ msgstr "" "Private)." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1854 +#: C/index.docbook:1865 msgid "No symbol index." msgstr "Δεν υπάρχει ευρετήριο συμβόλων." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1855 +#: C/index.docbook:1866 msgid "" "Does the <package>-docs.{xml,sgml} contain a " "index that xi:includes the generated index?" @@ -3182,28 +3206,28 @@ msgstr "" "ευρετήριο το οποίο περιλαμβάνει με xi:includes το παραγόμενο ευρετήριο;" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1861 +#: C/index.docbook:1872 msgid "Symbols are not linked to their doc-section." msgstr "" "Δεν υπάρχουν σύνδεσμοι μεταξύ των συμβόλων και των κατάλληλων ενοτήτων της " "τεκμηρίωσης." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1862 +#: C/index.docbook:1873 msgid "" "Is the doc-comment using the correct markup (added #,% or ())? Check if the " "gtkdoc-fixxref warns about unresolvable xrefs." msgstr "" -"Το doc-comment χρησιμοποιεί σωστά τις ετικέτες (έχουν προστεθεί #,% ή ()); " -"Ελέγξτε αν το gtkdoc-fixxref προειδοποιεί για ανεπίλυτα xrefs." +"Το doc-comment χρησιμοποιεί σωστά τις επισημάνσεις (έχουν προστεθεί #,% ή " +"()); Ελέγξτε αν το gtkdoc-fixxref προειδοποιεί για ανεπίλυτα xrefs." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1868 +#: C/index.docbook:1879 msgid "A new class does not appear in the docs." msgstr "Μια νέα κλάση δεν εμφανίζεται στην τεκμηρίωση." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1869 +#: C/index.docbook:1880 msgid "" "Is the new page xi:included from <package>-docs.{xml,sgml}." @@ -3212,12 +3236,12 @@ msgstr "" "docs.{xml,sgml};" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1875 +#: C/index.docbook:1886 msgid "A new symbol does not appear in the docs." msgstr "Ένα νέο σύμβολο δεν εμφανίζεται στην τεκμηρίωση." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1876 +#: C/index.docbook:1887 msgid "" "Is the doc-comment properly formatted. Check for spelling mistakes in the " "begin of the comment. Check if the gtkdoc-fixxref warns about unresolvable " @@ -3230,33 +3254,33 @@ msgstr "" "<package>-sections.txt σε μια δημόσια υποενότητα." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1884 +#: C/index.docbook:1895 msgid "A type is missing from the class hierarchy." msgstr "Λείπει ένας τύπος από την ιεραρχία κλάσεων." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1885 +#: C/index.docbook:1896 msgid "" "If the type is listed in <package>.hierarchy but " "not in xml/tree_index.sgml then double check that the " "type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed " -"or incidentialy makred private it will not be shown." +"or incidentally marked private it will not be shown." msgstr "" "Αν ο τύπος υπάρχει στο <package>.hierarchy αλλά " "όχι στο xml/tree_index.sgml τότε ελέγξτε ξανά ότι ο " "τύπος είναι σωστά τοποθετημένος στο <package>-sections.txt. Αν η περίσταση του τύπου (π.χ. GtkWidget) δεν είναι " -"καταχωρημένη, ή είναι κατά λάθος σημειωμένη ως ιδιωτική, τότε δε θα " +"filename>. Αν ο τύπος του παραδείγματος (π.χ. GtkWidget) δεν " +"είναι καταχωρημένος, ή είναι κατά λάθος σημειωμένος ως ιδιωτικός, τότε δε θα " "εμφανιστεί." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1894 +#: C/index.docbook:1905 msgid "I get foldoc links for all gobject annotations." msgstr "Λαμβάνω συνδέσμους foldoc για όλες τις σημειώσεις gobject." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1895 +#: C/index.docbook:1906 msgid "" "Check that xml/annotation-glossary.xml is xi:included " "from <package>-docs.{xml,sgml}." @@ -3265,13 +3289,13 @@ msgstr "" "included από το <package>-docs.{xml,sgml}." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1903 +#: C/index.docbook:1914 msgid "Parameter described in source code comment block but does not exist" msgstr "" "Μια παράμετρος περιγράφεται σε σχόλιο του πηγαίου κώδικα, αλλά δεν υπάρχει" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1904 +#: C/index.docbook:1915 msgid "" "Check if the prototype in the header has different parameter names as in the " "source." @@ -3280,35 +3304,35 @@ msgstr "" "παράμετρο από αυτό που αναφέρεται στον κώδικα." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1909 +#: C/index.docbook:1920 msgid "multiple \"IDs\" for constraint linkend: XYZ" -msgstr "Πολλαπλά \"IDs\" για τον προορισμό συνδέσμου: XYZ" +msgstr "Πολλαπλά \"Αναγνωριστικά\" για τον προορισμό συνδέσμου: XYZ" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1910 +#: C/index.docbook:1921 msgid "" "Symbol XYZ appears twice in <package>-sections.txt file." msgstr "" -"Το σύμβολο XYZ εμφανίζεται δύο φορές στο <package>-sections." -"txt." +"Το σύμβολο XYZ εμφανίζεται δύο φορές στο αρχείο <package>-" +"sections.txt." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1913 +#: C/index.docbook:1924 msgid "" "Element typename in namespace '' encountered in para, but no template " "matches." msgstr "" -"Βρέθηκε το όνομα τύπου του στοιχείου στο namespace '', αλλά δεν αντιστοιχεί " -"σε κανένα πρότυπο." +"Βρέθηκε το όνομα τύπου του στοιχείου στην ονοματοθεσία '', αλλά δεν " +"αντιστοιχεί σε κανένα πρότυπο." #. (itstool) path: chapter/title -#: C/index.docbook:1920 +#: C/index.docbook:1931 msgid "Tools related to gtk-doc" msgstr "Εργαλεία σχετικά με το gtk-doc" #. (itstool) path: chapter/para -#: C/index.docbook:1922 +#: C/index.docbook:1933 msgid "" "GtkDocPlugin - a Trac " "GTK-Doc integration plugin, that adds API docs to a trac site and " @@ -3319,7 +3343,7 @@ msgstr "" "ιστοσελίδες trac και ενσωματώνεται με την αναζήτηση trac." #. (itstool) path: chapter/para -#: C/index.docbook:1927 +#: C/index.docbook:1938 msgid "" "Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since " "tags in the API to determine the minimum required version." @@ -3357,7 +3381,7 @@ msgid "" "of this license document, but changing it is not allowed." msgstr "" "<_:address-1/> Επιτρέπεται σε όλους η αντιγραφή και διανομή ακριβούς " -"αντιγράφου του κειμένου αυτής της άδειας αλλά απαγορεύεται η αλλοίωσή του " +"αντιγράφου του κειμένου αυτής της άδειας αλλά απαγορεύεται η αλλοίωση του " "περιεχομένου του." #. (itstool) path: appendix/title @@ -3531,10 +3555,10 @@ msgstr "" "διαθέσιμων επεξεργαστών σχεδίων· το αντίγραφο είναι κατάλληλο για είσοδο σε " "μορφοποιητές κειμένου ή για αυτόματη μετάφραση σε ποικίλες μορφές κατάλληλες " "για είσοδο σε μορφοποιητές κειμένου. Δεν θεωρείται Διαφανές ένα αντίγραφο σε " -"Διαφανή, κατά τα λοιπά, μορφή αρχείου, του οποίου η σήμανση έχει σχεδιαστεί " -"κατά τρόπο που να αποτρέπει ή να αποθαρρύνει τη μελλοντική τροποποίηση του " -"αντιγράφου από τους αναγνώστες. Το αντίγραφο που δεν είναι Διαφανές ονομάζεται Αδιαφανές." +"Διαφανή, κατά τα λοιπά, μορφή αρχείου, του οποίου η επισήμανση έχει " +"σχεδιαστεί κατά τρόπο που να αποτρέπει ή να αποθαρρύνει τη μελλοντική " +"τροποποίηση του αντιγράφου από τους αναγνώστες. Το αντίγραφο που δεν είναι " +"Διαφανές ονομάζεται Αδιαφανές." #. (itstool) path: sect1/para #: C/index.docbook:128 C/fdl-appendix.xml:128 @@ -3549,8 +3573,8 @@ msgid "" "for output purposes only." msgstr "" "Παραδείγματα μορφών κατάλληλων για τη δημιουργία Διαφανών αντιγράφων είναι η " -"απλή ASCII χωρίς σήμανση, η μορφή εισόδου Texinfo, η μορφή εισόδου LaTeX, η " -"SGML ή XML που χρησιμοποιούν δημοσίως διαθέσιμη DTD, και η HTML που " +"απλή ASCII χωρίς επισήμανση, η μορφή εισόδου Texinfo, η μορφή εισόδου LaTeX, " +"η SGML ή XML που χρησιμοποιούν δημοσίως διαθέσιμη DTD, και η HTML που " "συμμορφώνεται με πρότυπα και έχει σχεδιαστεί για τροποποίηση από τον " "άνθρωπο. Στις Αδιαφανείς μορφές συμπεριλαμβάνονται η PostScript, η PDF, οι " "ιδιοταγείς μορφές που αναγιγνώσκονται μόνο από ιδιοταγείς επεξεργαστές " @@ -4167,7 +4191,7 @@ msgstr "" #. (itstool) path: sect1/para #: C/index.docbook:527 C/fdl-appendix.xml:527 msgid "" -"You may extract a single document from such a collection, and dispbibute it " +"You may extract a single document from such a collection, and distribute it " "individually under this License, provided you insert a copy of this License " "into the extracted document, and follow this License in all other respects " "regarding verbatim copying of that document." @@ -4645,9 +4669,9 @@ msgstr "" "αντίγραφο είναι κατάλληλο για είσοδο σε μορφοποιητές κειμένου ή για αυτόματη " "μετάφραση σε ποικίλες μορφές κατάλληλες για είσοδο σε μορφοποιητές κειμένου. " "Δεν θεωρείται Διαφανές ένα αντίγραφο σε Διαφανή, κατά τα λοιπά, μορφή " -"αρχείου, του οποίου η σήμανση έχει σχεδιαστεί κατά τρόπο που να αποτρέπει ή " -"να αποθαρρύνει τη μελλοντική τροποποίηση του αντιγράφου από τους αναγνώστες. " -"Το αντίγραφο που δεν είναι <_:quote-3/> ονομάζεται <_:quote-4/>." +"αρχείου, του οποίου η επισήμανση έχει σχεδιαστεί κατά τρόπο που να αποτρέπει " +"ή να αποθαρρύνει τη μελλοντική τροποποίηση του αντιγράφου από τους " +"αναγνώστες. Το αντίγραφο που δεν είναι <_:quote-3/> ονομάζεται <_:quote-4/>." #. (itstool) path: para/quote #. (itstool) path: para/link @@ -5265,12 +5289,12 @@ msgstr "" #. (itstool) path: para/link #: C/fdl-appendix.xml:639 C/fdl-appendix.xml:651 msgid "Front-Cover Texts" -msgstr "Κείμενα εμπροσθοφύλλου" +msgstr "Κείμενα Εμπροσθοφύλλου" #. (itstool) path: para/link #: C/fdl-appendix.xml:640 C/fdl-appendix.xml:654 msgid "Back-Cover Texts" -msgstr "Κείμενα οπισθοφύλλου" +msgstr "Κείμενα Οπισθοφύλλου" #. (itstool) path: blockquote/para #: C/fdl-appendix.xml:632 @@ -5292,7 +5316,7 @@ msgstr "" #. (itstool) path: para/quote #: C/fdl-appendix.xml:649 msgid "with no Invariant Sections" -msgstr "χωρίς Αμετάβλητων Ενοτήτων" +msgstr "χωρίς Αμετάβλητες Ενότητες" #. (itstool) path: para/quote #: C/fdl-appendix.xml:652 @@ -5311,9 +5335,9 @@ msgid "" "are invariant. If you have no <_:link-3/>, write <_:quote-4/> instead of <_:" "quote-5/>; likewise for <_:link-6/>." msgstr "" -"Αν δεν έχετε <_:link-1/>, γράψτε <_:quote-2/> αντί να λέτε ποια είναι " -"αμετάβλητα. Αν δεν έχετε <_:link-3/>, γράψτε <_:quote-4/> αντί του <_:" -"quote-5/>, επίσης για <_:link-6/>." +"Αν δεν περιέχονται <_:link-1/>, γράψτε <_:quote-2/> αντί να απαριθμήσετε τις " +"αμετάβλητες ενότητες. Αν δεν περιέχονται <_:link-3/>, γράψτε <_:quote-4/> " +"αντί για <_:quote-5/>, επίσης για <_:link-6/>." #. (itstool) path: para/ulink #: C/fdl-appendix.xml:661 diff --git a/help/manual/el/fdl-appendix.xml b/help/manual/el/fdl-appendix.xml index de500fa..193e27c 100644 --- a/help/manual/el/fdl-appendix.xml +++ b/help/manual/el/fdl-appendix.xml @@ -16,7 +16,7 @@
Free Software Foundation, Inc. 51 Franklin Street, Suite 330, Boston, MA - 02110-1301 USA
Επιτρέπεται σε όλους η αντιγραφή και διανομή ακριβούς αντιγράφου του κειμένου αυτής της άδειας αλλά απαγορεύεται η αλλοίωσή του περιεχομένου του. + 02110-1301 USA Επιτρέπεται σε όλους η αντιγραφή και διανομή ακριβούς αντιγράφου του κειμένου αυτής της άδειας αλλά απαγορεύεται η αλλοίωση του περιεχομένου του. Άδεια Ελεύθερης Τεκμηρίωσης GNU (GFDL) @@ -41,9 +41,9 @@ Τα Κείμενα Εξωφύλλου είναι σύντομα αποσπάσματα κειμένου που αναφέρονται ρητώς ως Κείμενα Εμπροσθοφύλλου ή Κείμενα Οπισθοφύλλου στην ένδειξη όπου αναφέρεται ότι το Έγγραφo δημοσιεύεται υπό τους όρους αυτής της Άδειας. - Ως Διαφανές αντίγραφο από το Έγγραφo θεωρείται κάθε αντίγραφο σε μορφή αναγνώσιμη από μηχανή, όταν συντρέχουν οι εξής προϋποθέσεις: Οι τεχνικές προδιαγραφές τις μορφής αυτής είναι διαθέσιμες για δημόσια χρήση· τα περιεχόμενα του αντιγράφου μπορούν να προβληθούν και να τύχουν επεξεργασίας άμεσα και απλά, με χρήση γενόσημων επεξεργαστών κειμένου ή ( για εικόνες αποτελούμενες από εικονοστοιχεία) γενόσημων προγραμμάτων ζωγραφικής ή (για σχέδια) ευρέως διαθέσιμων επεξεργαστών σχεδίων· το αντίγραφο είναι κατάλληλο για είσοδο σε μορφοποιητές κειμένου ή για αυτόματη μετάφραση σε ποικίλες μορφές κατάλληλες για είσοδο σε μορφοποιητές κειμένου. Δεν θεωρείται Διαφανές ένα αντίγραφο σε Διαφανή, κατά τα λοιπά, μορφή αρχείου, του οποίου η σήμανση έχει σχεδιαστεί κατά τρόπο που να αποτρέπει ή να αποθαρρύνει τη μελλοντική τροποποίηση του αντιγράφου από τους αναγνώστες. Το αντίγραφο που δεν είναι Διαφανές ονομάζεται Αδιαφανές. + Ως Διαφανές αντίγραφο από το Έγγραφo θεωρείται κάθε αντίγραφο σε μορφή αναγνώσιμη από μηχανή, όταν συντρέχουν οι εξής προϋποθέσεις: Οι τεχνικές προδιαγραφές τις μορφής αυτής είναι διαθέσιμες για δημόσια χρήση· τα περιεχόμενα του αντιγράφου μπορούν να προβληθούν και να τύχουν επεξεργασίας άμεσα και απλά, με χρήση γενόσημων επεξεργαστών κειμένου ή ( για εικόνες αποτελούμενες από εικονοστοιχεία) γενόσημων προγραμμάτων ζωγραφικής ή (για σχέδια) ευρέως διαθέσιμων επεξεργαστών σχεδίων· το αντίγραφο είναι κατάλληλο για είσοδο σε μορφοποιητές κειμένου ή για αυτόματη μετάφραση σε ποικίλες μορφές κατάλληλες για είσοδο σε μορφοποιητές κειμένου. Δεν θεωρείται Διαφανές ένα αντίγραφο σε Διαφανή, κατά τα λοιπά, μορφή αρχείου, του οποίου η επισήμανση έχει σχεδιαστεί κατά τρόπο που να αποτρέπει ή να αποθαρρύνει τη μελλοντική τροποποίηση του αντιγράφου από τους αναγνώστες. Το αντίγραφο που δεν είναι Διαφανές ονομάζεται Αδιαφανές. - Παραδείγματα μορφών κατάλληλων για τη δημιουργία Διαφανών αντιγράφων είναι η απλή ASCII χωρίς σήμανση, η μορφή εισόδου Texinfo, η μορφή εισόδου LaTeX, η SGML ή XML που χρησιμοποιούν δημοσίως διαθέσιμη DTD, και η HTML που συμμορφώνεται με πρότυπα και έχει σχεδιαστεί για τροποποίηση από τον άνθρωπο. Στις Αδιαφανείς μορφές συμπεριλαμβάνονται η PostScript, η PDF, οι ιδιοταγείς μορφές που αναγιγνώσκονται μόνο από ιδιοταγείς επεξεργαστές κειμένου, η SGML ή XML των οποίων η DTD και/ή τα εργαλεία επεξεργασίας δεν είναι δημοσίως διαθέσιμα, και η HTML με αποκλειστικό προορισμό την έξοδο που παράγουν μηχανοκίνητα ορισμένοι επεξεργαστές κειμένου. + Παραδείγματα μορφών κατάλληλων για τη δημιουργία Διαφανών αντιγράφων είναι η απλή ASCII χωρίς επισήμανση, η μορφή εισόδου Texinfo, η μορφή εισόδου LaTeX, η SGML ή XML που χρησιμοποιούν δημοσίως διαθέσιμη DTD, και η HTML που συμμορφώνεται με πρότυπα και έχει σχεδιαστεί για τροποποίηση από τον άνθρωπο. Στις Αδιαφανείς μορφές συμπεριλαμβάνονται η PostScript, η PDF, οι ιδιοταγείς μορφές που αναγιγνώσκονται μόνο από ιδιοταγείς επεξεργαστές κειμένου, η SGML ή XML των οποίων η DTD και/ή τα εργαλεία επεξεργασίας δεν είναι δημοσίως διαθέσιμα, και η HTML με αποκλειστικό προορισμό την έξοδο που παράγουν μηχανοκίνητα ορισμένοι επεξεργαστές κειμένου. Ως Σελίδα Τίτλου θεωρείται, για τα έντυπα βιβλία, η σελίδα τίτλου αυτή καθαυτή, καθώς και τυχόν επόμενες σελίδες που απαιτούνται για την ευανάγνωστη συμπερίληψη του υλικού που οφείλει να εμφανίζεται στη σελίδα τίτλου σύμφωνα με την παρούσα Άδεια. Για τα έργα σε μορφές που δεν περιλαμβάνουν σελίδα τίτλου αυτή καθαυτή, ως Σελίδα Τίτλου θεωρείται το κείμενο που βρίσκεται κοντά στην εμφανέστερη εμφάνιση του τίτλου του έργου και το οποίο προηγείται του σώματος του κειμένου. @@ -223,10 +223,10 @@
Copyright © ΕΤΟΣ ΤΟ ΟΝΟΜΑ ΣΑΣ. - Χορηγείται άδεια αντιγραφής, διανομής και/ή τροποποίησης του παρόντος εγγράφου υπό τους όρους της έκδοσης 1.1 της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), ή οποιασδήποτε μεταγενέστερης έκδοσής αυτής από το Ίδρυμα Ελεύθερου Λογισμικού (FSF)· οι Αμετάβλητες Ενότητες είναι οι ΚΑΤΑΛΟΓΟΣ ΤΙΤΛΩΝ, τα Κείμενα εμπροσθοφύλλου είναι τα ΚΑΤΑΛΟΓΟΣ, και τα Κείμενα οπισθοφύλλου είναι τα ΚΑΤΑΛΟΓΟΣ. Αντίγραφο της άδειας συμπεριλαμβάνεται στην ενότητα με τίτλο Άδεια Ελεύθερης Τεκμηρίωσης GNU (GFDL). + Χορηγείται άδεια αντιγραφής, διανομής και/ή τροποποίησης του παρόντος εγγράφου υπό τους όρους της έκδοσης 1.1 της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), ή οποιασδήποτε μεταγενέστερης έκδοσής αυτής από το Ίδρυμα Ελεύθερου Λογισμικού (FSF)· οι Αμετάβλητες Ενότητες είναι οι ΚΑΤΑΛΟΓΟΣ ΤΙΤΛΩΝ, τα Κείμενα Εμπροσθοφύλλου είναι τα ΚΑΤΑΛΟΓΟΣ, και τα Κείμενα Οπισθοφύλλου είναι τα ΚΑΤΑΛΟΓΟΣ. Αντίγραφο της άδειας συμπεριλαμβάνεται στην ενότητα με τίτλο Άδεια Ελεύθερης Τεκμηρίωσης GNU (GFDL).
- Αν δεν έχετε Αμετάβλητες Ενότητες, γράψτε χωρίς Αμετάβλητων Ενοτήτων αντί να λέτε ποια είναι αμετάβλητα. Αν δεν έχετε Κείμενα εμπροσθοφύλλου, γράψτε χωρίς Κείμενα Εμπροσθοφύλλου αντί του τα Κείμενα Εμπροσθοφύλλου είναι τα ΚΑΤΑΛΟΓΟΣ, επίσης για Κείμενα οπισθοφύλλου. + Αν δεν περιέχονται Αμετάβλητες Ενότητες, γράψτε χωρίς Αμετάβλητες Ενότητες αντί να απαριθμήσετε τις αμετάβλητες ενότητες. Αν δεν περιέχονται Κείμενα Εμπροσθοφύλλου, γράψτε χωρίς Κείμενα Εμπροσθοφύλλου αντί για τα Κείμενα Εμπροσθοφύλλου είναι τα ΚΑΤΑΛΟΓΟΣ, επίσης για Κείμενα Οπισθοφύλλου. Αν το έγγραφό σας περιέχει μη-ασήμαντα παραδείγματα πηγαίου κώδικα, συνιστούμε την παράλληλη δημοσίευσή τους, υπό τους όρους της άδειας ελεύθερου λογισμικού της αρεσκείας σας,όπως η Γενική Άδεια Δημόσιας Χρήσης GNU, ώστε να επιτρέψετε τη χρήση τους σε ελεύθερο λογισμικό. diff --git a/help/manual/el/index.docbook b/help/manual/el/index.docbook index 7a47bd1..c34cbf9 100644 --- a/help/manual/el/index.docbook +++ b/help/manual/el/index.docbook @@ -34,11 +34,12 @@ - 1.20.1 16 Φεβ. 2014 ss έκδοση ανάπτυξης - 1.20 16 Φεβ 2014 ss διορθώσεις σφαλμάτων,, υποστήριξη markdown, και βελτιώσεις τεχνοτροπιών - 1.19 05 Ιουν 2013 ss διόρθωση σφάλματος + 1.21.1 18 Ιουλ 2014 ss έκδοση ανάπτυξης + 1.21 17 Ιουλ 2013 ss διορθώσεις σφαλμάτων, απόρριψη παρωχημένων λειτουργιών + 1.20 16 Φεβ 2014 ss διορθώσεις σφαλμάτων, υποστήριξη markdown, και βελτιώσεις στυλ + 1.19 05 Ιουν 2013 ss διόρθωση σφαλμάτων 1.18 14 Σεπτ 2011 ss διορθώσεις σφαλμάτων, επιταχύνσεις, υποστήριξη markdown - 1.17 26 Φεβ 2011 sk διόρθωση σφάλματος + 1.17 26 Φεβ 2011 sk επείγουσα διόρθωση σφάλματος 1.16 14 Ιαν 2011 sk διορθώσεις σφαλμάτων και βελτιώσεις διάταξης 1.15 21 Μαίου 2010 sk διορθώσεις σφαλμάτων και αναδρομής 1.14 28 Μαρτίου 2010 sk διορθώσεις σφαλμάτων και βελτιώσεις επίδοσης @@ -48,6 +49,19 @@ + + + Ελληνική μεταφραστική ομάδα GNOME + + team@gnome.gr + + + + 2009-2014 + + Ελληνική μεταφραστική ομάδα GNOME + + Τζένη Πετούμενου @@ -101,6 +115,19 @@ Μαρία Θουκυδίδου + + + + Μαρία Μαυρίδου + + mavridou@gmail.com + + + + 2014 + + Μαρία Μαυρίδου + @@ -121,7 +148,7 @@ Το GTK-Doc χρησιμοποιεί την τεκμηρίωση συναρτήσεων που έχει συμπεριληφθεί στα πηγαία αρχεία (εντός μπλοκ σχολίων με ειδική μορφή), ή την τεκμηρίωση που έχει προστεθεί στα πρότυπα αρχεία που χρησιμοποιεί το GTK-Doc (σημειώστε όμως ότι το GTK-Doc παράγει τεκμηρίωση μόνο για τις συναρτήσεις που δηλώνονται σε αρχεία κεφαλίδας· δεν παράγει τεκμηρίωση για στατικές συναρτήσεις). - Το GTK-Doc αποτελείται από μια σειρά σεναρίων perl , καθένα από τα οποία είναι υπεύθυνο για διαφορετικό στάδιο της όλης διαδικασίας. + Το GTK-Doc αποτελείται από μια σειρά δέσμης ενεργειών perl, καθένα από τα οποία είναι υπεύθυνο για διαφορετικό στάδιο της όλης διαδικασίας. Η διαδικασία περιλαμβάνει 5 κύρια στάδια: @@ -133,8 +160,8 @@ Συλλέγοντας πληροφορίες για τον κώδικα. Το gtkdoc-scan σαρώνει τα αρχεία κεφαλίδων του κώδικα ψάχνοντας για δηλώσεις συναρτήσεων, μακροεντολές, enums, δομές και ενώσεις. Δημιουργεί το αρχείο <module>-decl-list.txt που περιέχει μια λίστα με τις δηλώσεις, και τις τοποθετεί σε ενότητες αναλόγως με το αρχείο κεφαλίδας στο οποίο βρίσκονται. Από την πρώτη εκτέλεση του προγράμματος το αρχείο αντιγράφεται στο <module>-sections.txt. Ο συγγραφέας μπορεί να τακτοποιεί τις ενότητες και τη σειρά των δηλώσεων, για να παραγάγει το επιθυμητό τελικό αποτέλεσμα. Το δεύτερο αρχείο δημιουργεί το <module>-decl.txt. Το αρχείο αυτό περιέχει τις πλήρεις δηλώσεις που βρέθηκαν από τον σαρωτή.Αν για κάποιο λόγο θέλετε μερικά σύμβολα να εμφανίζονται στην τεκμηρίωση, όπου η πλήρης δήλωση δεν μπορεί να βρεθεί από τον σαρωτή, ή πρέπει να εμφανίζεται διαφορετικά, μπορεί κάποιος να τοποθετήσει οντότητες παρόμοιες με αυτές <module>-decl.txt στο αρχείο <module>-overrides.txt. - Το gtkdoc-scanobj μπορεί επίσης να χρησιμοποιηθεί για να κάνει δυναμική αναζήτηση σε μια βιβλιοθήκη για ενδεχόμενες υποκλάσεις GObject. Αποθηκεύει τις πληροφορίες για τη θέση κάθε αντικειμένου στην ιεραρχία κλάσεων καθώς και για τα ορίσματα και σήματα GObject που περιέχει. - Το gtkdoc-scanobj δεν πρέπει να χρησιμοποιείτε πλέον. Χρειαζόταν στο παρελθόν όταν το GObject ήταν ακόμα GtkObject μέσα στη gtk+. + Το gtkdoc-scanobj μπορεί επίσης να χρησιμοποιηθεί για να κάνει δυναμική αναζήτηση σε μια βιβλιοθήκη για ενδεχόμενες υποκλάσεις GObject. Αποθηκεύει τις πληροφορίες για τη θέση κάθε αντικειμένου στην ιεραρχία κλάσεων καθώς και για τις ιδιότητες και σήματα GObject που περιέχει. + Το gtkdoc-scanobj δεν πρέπει να χρησιμοποιείται πλέον. Χρειαζόταν στο παρελθόν όταν το GObject ήταν ακόμα GtkObject μέσα στη gtk+. @@ -147,7 +174,7 @@ Παραγωγή SGML/XML και HTML/PDF. Το gtkdoc-mkdb μετατρέπει τα αρχεία προτύπων tmpl σε αρχεία SGML ή XML και τα τοποθετεί στους υποκαταλόγους sgml/ ή xml/. Αν ο πηγαίος κώδικας περιέχει τεκμηρίωση συναρτήσεων εντός ειδικών μπλοκ σχολίων, τα σχόλια συγχωνεύονται σε αυτό το στάδιο. Αν δεν υπάρχουν αρχεία προτύπων tmpl, τότε χρησιμοποιούνται μόνο τα έγγραφα που προέκυψαν από τον πηγαίο κώδικα και τα δεδομένα της ενδοσκόπησης. Σας συνιστούμε να χρησιμοποιήσετε το βιβλίο τεκμηρίωσης XML. Το gtkdoc-mkhtml μετατρέπει τα αρχεία SGML/XML σε αρχεία HTML που τοποθετούνται στον υποκατάλογο html/. Ομοίως, το gtkdoc-mkpdf μετατρέπει τα αρχεία SGML/XML σε ένα αρχείο PDF που ονομάζεται <package>.pdf. - Τα αρχεία στους καταλόγους sgml/, xml/ και html/ αντικαθίστανται αυτόματα. Επομένως, δεν πρέπει να τα αλλάζετε με το χέρι. + Τα αρχεία στους καταλόγους sgml/, xml/ και html/ αντικαθίστανται αυτόματα. Επομένως, δεν πρέπει να τα επεξεργάζεστε απευθείας. @@ -162,11 +189,11 @@ Απαιτήσεις - Perl v5 - τα βασικά σενάρια είναι γραμμένα σε Perl. + Perl v5 - οι κύριες δέσμες ενεργειών είναι γραμμένες σε Perl. xsltproc - το πρόγραμμα xslt processor από τη βιβλιοθήκη libxslt xmlsoft.org/XSLT/ - docbook-xsl - τα docbook xsl stylesheets sourceforge.net/projects/docbook/files/docbook-xsl + docbook-xsl - τα φύλλα στυλ docbook xsl sourceforge.net/projects/docbook/files/docbook-xsl Python - προαιρετική - για το gtkdoc-depscan - Ένα από τα source-highlight, highlight ή vim - optional - που χρησιμοποιούνται για την επισήμανση της σύνταξης στα παραδείγματα + Ένα από τα source-highlight, highlight ή vim - προαιρετικά - που χρησιμοποιούνται για την επισήμανση της σύνταξης στα παραδείγματα @@ -175,7 +202,7 @@ (ΠΡΟΣ ΔΙΟΡΘΩΣΗ) - (Ιστορικό, συγγραφείς, ιστοσελίδες, ταχυδρομική λίστα, άδεια, μελλοντικά σχέδια, σύγκριση με άλλα παρόμοια συστήματα.) + (Ιστορικό, συγγραφείς, ιστοσελίδες, λίστα αλληλογραφίας, άδεια, μελλοντικά σχέδια, σύγκριση με άλλα παρόμοια συστήματα.) @@ -193,7 +220,7 @@ Δημιουργώντας το δικό σας έργο - Οι επόμενες ενότητες περιγράφουν τα βήματα που απαιτούνται για να ενσωματώσετε το GTK-Doc στο έργο σας. Αυτές οι ενότητες προϋποθέτουν ότι εργάζεσθε σε ένα έργο που λέγεται 'meep'. Το έργο περιέχει τη βιβλιοθήκη 'libmeep' και την εφαρμογή 'meeper' για τον τελικό χρήστη. Προϋποτίθεται επίσης ότι θα χρησιμοποιείτε το autoconf και το automake. Επιπλέον, η ενότητα αρχεία makefiles ή άλλα συστήματα ανάπτυξης περιγράφει τα βασικά που χρειάζονται για να δουλέψετε σε ένα διαφορετικό έργο. + Οι επόμενες ενότητες περιγράφουν τα βήματα που απαιτούνται για να ενσωματώσετε το GTK-Doc στο έργο σας. Αυτές οι ενότητες προϋποθέτουν ότι εργάζεσθε σε ένα έργο που λέγεται 'meep'. Το έργο περιέχει τη βιβλιοθήκη 'libmeep' και την εφαρμογή 'meeper' για τον τελικό χρήστη. Θεωρούμε επίσης, ότι θα χρησιμοποιείτε το autoconf και το automake. Επιπλέον, η ενότητα αρχεία makefiles ή άλλα συστήματα ανάπτυξης θα περιγράψει τα βασικά στοιχεία που απαιτούνται για να εργαστείτε σε μια διαφορετική δόμηση ρυθμίσεων. Δημιουργία του σκελετού τεκμηρίωσης @@ -217,7 +244,7 @@ meep/ Ενσωμάτωση στο autoconf - Πολύ εύκολα! Απλά προσθέτετε μία γραμμή στο σενάριο configure.ac. + Πολύ εύκολα! Απλά προσθέτετε μία γραμμή στη δέσμη ενεργειών configure.ac. Ενσωμάτωση στο autoconf @@ -228,7 +255,7 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) - Αυτό απαιτεί από όλους τους προγραμματιστές να έχουν εγκατεστημένο το gtk-doc. Αν είναι εντάξει για το έργο σας να έχετε μια επιπλέον κατασκευή ρυθμίσεων για το api-doc, μπορείτε να το επιλύσετε όπως αναφέρεται παρακάτω. Αφήστε το ως έχει, όσο το gtkdocize αναζητά την αρχή της σειράς για το GTK_DOC_CHECK. Προαιρετικά κρατήστε το gtk-doc + Αυτό απαιτεί από όλους τους προγραμματιστές να έχουν εγκατεστημένο το gtk-doc. Αν είναι εντάξει για το έργο σας να έχετε μια επιπλέον δόμηση ρυθμίσεων για το api-doc, μπορείτε να το επιλύσετε όπως αναφέρεται παρακάτω. Αφήστε το ως έχει, όσο το gtkdocize αναζητά την αρχή της σειράς για το GTK_DOC_CHECK. Προαιρετικά διατηρήστε το gtk-doc # έλεγχος για gtk-doc m4_ifdef([GTK_DOC_CHECK], [ @@ -241,17 +268,17 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false) Το πρώτο όρισμα χρησιμοποιείται για έλεγχο του gtkdocversion κατά τη ρύθμιση. Το δεύτερο, προαιρετικό όρισμα χρησιμοποιείται από το gtkdocize. Η μακροεντολή GTK_DOC_CHECK επίσης προσθέτει αρκετούς διακόπτες ρύθμισης: - --with-html-dir=ΔΙΑΔΡΟΜΗ : διαδρομή προς την εγκατεστημένη τεκμηρίωση - --enable-gtk-doc : χρήση gtk-doc για την τεκμηρίωση [default=no] - --enable-gtk-doc-html : παραγωγή τεκμηρίωσης σε μορφή html [default=yes] - --enable-gtk-doc-pdf : παραγωγή τεκμηρίωσης σε μορφή pdf [default=no] + --with-html-dir= PATH : διαδρομή προς την εγκατεστημένη τεκμηρίωση + --enable-gtk-doc : χρήση gtk-doc για τη δόμηση τεκμηρίωσης [προεπιλογή=no] + --enable-gtk-doc-html : δόμηση τεκμηρίωσης σε μορφή html [προεπιλογή=yes] + --enable-gtk-doc-pdf : δόμηση τεκμηρίωσης σε μορφή pdf [προεπιλογή=no] Το GTK-Doc είναι απενεργοποιημένο από προεπιλογή! Να θυμάστε να χρησιμοποιείτε την επιλογή στην επόμενη εκτέλεση του configure. Διαφορετικά, εγκαθίσταται η προπαραχθείσα τεκμηρίωση (δυνατότητα χρήσιμη για τον χρήστη, αλλά όχι για τον προγραμματιστή). - Επίσης, συνιστάται να προσθέσετε την ακόλουθη γραμμή στο σενάριο configure.ac. Επιτρέπει στο gtkdocize να αντιγράφει αυτόματα τον ορισμό της μακροεντολής GTK_DOC_CHECK στο έργο σας. + Επίσης, συνιστάται να προσθέσετε την ακόλουθη γραμμή στη δέσμη ενεργειών configure.ac. Αυτό επιτρέπει στο gtkdocize να αντιγράφει αυτόματα τον ορισμό της μακροεντολής για το GTK_DOC_CHECK στο έργο σας. Προετοιμασία για το gtkdocize @@ -260,7 +287,7 @@ AC_CONFIG_MACRO_DIR(m4) - Όταν όλες οι αλλαγές στο configure.ac έχουν γίνει, ενημερώστε το αρχείο ρύθμιση. Αυτό μπορείτε να το κάνετε επανεκετελώντας το autoreconf -i ή το autogen.sh. + Όταν όλες οι αλλαγές στο configure.ac έχουν γίνει, ενημερώστε το αρχείο configure. Αυτό μπορείτε να το κάνετε επανεκετελώντας το autoreconf -i ή το autogen.sh. @@ -268,7 +295,7 @@ AC_CONFIG_MACRO_DIR(m4) Πρώτα αντιγράψτε το Makefile.am από τον υποκατάλογο με τα παραδείγματα των gtkdoc-sources στον κατάλογο της τεκμηρίωσης API του έργου σας ( ./docs/reference/<package>). Ένα τοπικό αντίγραφο θα πρέπει να είναι διαθέσιμο π.χ. στο /usr/share/doc/gtk-doc-tools/examples/Makefile.am. Αν έχετε πολλά doc-packages επαναλάβετε αυτό το βήμα για το καθένα απο αυτά. - Το επόμενο βήμα είναι να τροποποιήσετε τις ρυθμίσεις στο Makefile.am. Πριν από κάθε ρύθμιση υπάρχει ένα σχόλιο που εξηγεί τη χρησιμότητά της. Οι περισσότερες είναι σημαίες που στέλνονται στα αντίστοιχα εργαλεία. Κάθε εργαλείο διαθέτει μια μεταβλητή της μορφής . όλα τα εργαλεία υποστηρίζουν την επιλογή για την παραγωγή λίστας με τις υποστηριζόμενες παραμέτρους. + Το επόμενο βήμα είναι να τροποποιήσετε τις ρυθμίσεις στο Makefile.am. Πριν από κάθε ρύθμιση υπάρχει ένα σχόλιο που εξηγεί τη χρησιμότητά της. Οι περισσότερες είναι σημαίες που στέλνονται στα αντίστοιχα εργαλεία. Κάθε εργαλείο διαθέτει μια μεταβλητή της μορφής . Όλα τα εργαλεία υποστηρίζουν την επιλογή για την παραγωγή λίστας με τις υποστηριζόμενες παραμέτρους. @@ -277,7 +304,7 @@ AC_CONFIG_MACRO_DIR(m4) Ενσωμάτωση στο autogen - Τα περισσότερα έργα διαθέτουν ένα σενάριο autogen.sh για τη δημιουργία υποδομών μετά από έναν έλεγχο από το σύστημα ελέγχου εκδόσεων (π.χ., cvs/svn/git). Το GTK-Doc διαθέτει το εργαλείο gtkdocize, το οποίο μπορεί να χρησιμοποιηθεί για ένα τέτοιο σενάριο. Θα πρέπει να εκτελείται πριν το autoheader, το automake ή το autoconf. + Τα περισσότερα έργα διαθέτουν ένα σενάριο autogen.sh για τη δόμηση υποδομών μετά από έναν έλεγχο από το σύστημα ελέγχου εκδόσεων (π.χ., cvs/svn/git). Το GTK-Doc διαθέτει το εργαλείο gtkdocize, το οποίο μπορεί να χρησιμοποιηθεί για ένα τέτοιο σενάριο. Θα πρέπει να εκτελείται πριν το autoheader, το automake ή το autoconf. Εκτέλεση του gtkdocize από το autogen.sh @@ -287,18 +314,18 @@ gtkdocize || exit 1 - Κατά την εκτέλεσή του, το gtkdocize αντιγράφει το gtk-doc.make στο ριζικό κατάλογο του έργου σας (ή στον κατάλογο που ορίζει η επιλογή ). Επίσης, ελέγχει το σενάριο configure για να βρει την κλήση στο GTK_DOC_CHECK. + Κατά την εκτέλεσή του, το gtkdocize αντιγράφει το gtk-doc.make στο ριζικό κατάλογο του έργου σας (ή στον κατάλογο που ορίζει η επιλογή ). Επίσης, ελέγχει τη δέσμη ενεργειών configure για να βρει την κλήση στο GTK_DOC_CHECK. Αρχικά, το GTK-Doc δημιουργούσε αρχεία προτύπων εκεί που οι προγραμματιστές εισήγαγαν την τεκμηρίωση. Δυστυχώς, αυτή η προσέγγιση δεν ήταν ιδιαίτερα επιτυχής (π.χ η ανάγκη για παραγωγή αρχείων στο σύστημα ελέγχου εκδόσεων). Από την έκδοση 1.9 και μετά, τα πρότυπα αρχεία δεν είναι πλέον απαραίτητα. Σας συνιστούμε να διατηρείτε την τεκμηρίωση στον κώδικα. To gtkdocize υποστηρίζει πλέον την επιλογή που επιλέγει ένα αρχείο makefile που δεν χρησιμοποιεί καθόλου πρότυπα tmpl. Πέρα από την άμεση προσθήκη της επιλογής στην κλήση της εντολής, μπορεί να προστεθεί και σε μια μεταβλητή περιβάλλοντος που ονομάζεται GTKDOCIZE_FLAGS ή να ορισθεί ως δεύτερη παράμετρος στη μακροεντολή GTK_DOC_CHECK στο σενάριο configure. Αν δεν έχετε κάνει ποτέ αλλαγές με το χέρι σε αρχεία προτύπων και μεταβαίνετε από μια παλιότερη έκδοση του gtkdoc, παρακαλώ αφαιρέστε τον κατάλογο (π.χ. από το σύστημα ελέγχου εκδόσεων). - Παραγωγή της τεκμηρίωσης + Εκτέλεση της δόμησης τεκμηρίωσης - Αφού ολοκληρωθούν τα προηγούμενα βήματα, προχωρήστε στην παραγωγή. Πρώτα, θα πρέπει να εκτελεσθεί εκ νέου το autogen.sh. Αν το σενάριο εκτελεί και το configure, προσθέστε την επιλογή . Διαφορετικά, εκτελέστε εσείς τοconfigure με αυτή την επιλογή. + Αφού ολοκληρωθούν τα προηγούμενα βήματα, προχωρήστε στην δόμηση. Πρώτα, θα πρέπει να εκτελεσθεί εκ νέου το autogen.sh. Αν το σενάριο εκτελεί και το configure, προσθέστε την επιλογή . Διαφορετικά, εκτελέστε εσείς τοconfigure με αυτή την επιλογή. Η πρώτη εκτέλεση του make δημιουργεί μια σειρά από πρόσθετα αρχεία στους καταλόγους της τεκμηρίωσης. Τα σημαντικά είναι τα: <package>.types, <package>-docs.xml (στο παρελθόν .sgml), <package>-sections.txt. - Παραγωγή της τεκμηρίωσης + Εκτέλεση της δόμησης τεκμηρίωσης ./autogen.sh --enable-gtk-doc make @@ -311,16 +338,17 @@ make Ενσωμάτωση σε συστήματα ελέγχου εκδόσεων - Ο εμπειρικός κανόνας είναι ότι αυτά τα αρχεία που επεξεργασθήκατε πρέπει να περάσουν από τον έλεγχο έκδοσης. Για τυπικά έργα, πρόκειται για τα αρχεία: <package>.types, <package>-docs..xml (στο παρελθόν .sgml), <package>-sections.txt, Makefile.am + Ο εμπειρικός κανόνας είναι ότι αυτά τα αρχεία που επεξεργασθήκατε πρέπει να περάσουν από τον έλεγχο έκδοσης. Για τυπικά έργα, πρόκειται για τα αρχεία: <package>.types, <package>-docs.xml (στο παρελθόν .sgml), <package>-sections.txt, Makefile.am. + Αρχεία στους καταλόγους xml/ και html/ δεν θα πρέπει να υποβληθούν σε έλεγχο έκδοσης. Ούτε και αρχεία xml/ and html/. - Ενσωμάτωση στα αρχεία makefiles ή άλλα συστήματα ανάπτυξης + Ενσωμάτωση στα αρχεία makefiles ή άλλα συστήματα δόμησης - Στην περίπτωση που κάποιος δε θέλει να χρησιμοποιήσει το automake και, επομένως, το gtk-doc.mak θα χρειαστεί να καλέσει τα εργαλεία του gtkdoc στη σωστή σειρά στα makefiles (ή άλλα εργαλεία ανάπτυξης). + Στην περίπτωση που κάποιος δε θέλει να χρησιμοποιήσει το automake και, επομένως, το gtk-doc.mak θα χρειαστεί να καλέσει τα εργαλεία του gtkdoc στη σωστή σειρά στα makefiles (ή άλλα εργαλεία δόμησης). - Βήματα παραγωγής τεκμηρίωσης + Βήματα δόμησης τεκμηρίωσης DOC_MODULE=meep // sources have changed @@ -351,7 +379,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html Για να αποφύγετε αυτά τα προβλήματα, σας προτείνουμε να ενσωματώνετε την τεκμηρίωση στον πηγαίο κώδικα. Αυτή είναι και η μόνη μέθοδος που θα περιγράψουμε σε αυτό το εγχειρίδιο. - Ο σαρωτής μπορεί να χειρισθεί άνετα την πλειοψηφία των κεφαλίδων C . Σε περίπτωση που παίρνετε προειδοποιήσεις από τον σαρωτή οι οποίες μοιάζουν με έναν ειδικό χαρακτήρα, μπορείτε να υποδείξετε στο GTK-Doc να τους παραλείψει. Μπλοκ σχολίου GTK-Doc + Ο σαρωτής μπορεί να χειρισθεί άνετα την πλειοψηφία των κεφαλίδων C. Σε περίπτωση που παίρνετε προειδοποιήσεις από τον σαρωτή οι οποίες μοιάζουν με έναν ειδικό χαρακτήρα, μπορείτε να υποδείξετε στο GTK-Doc να τους παραλείψει. Μπλοκ σχολίου GTK-Doc #ifndef __GTK_DOC_IGNORE__ /* unparseable code here */ @@ -359,6 +387,15 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -388,7 +425,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - Ένα πλεονέκτημα της χρήσης υπερκειμένου αντί για απλό κείμενο, είναι η δυνατότητα προσθήκης συνδέσμων στο έγγραφο. Ωστόσο, η χρήση της σωστής σύνταξης για τη δημιουργία συνδέσμων μπορεί να είναι αρκετά κουραστική διαδικασία. Το GTK-Doc σας βοηθάει, παρέχοντάς σας μια σειρά από χρήσιμες συντμήσεις. + Ένα πλεονέκτημα της χρήσης υπερκειμένου αντί για απλό κείμενο, είναι η δυνατότητα προσθήκης συνδέσμων στο έγγραφο. Ωστόσο, η συγγραφή της σωστής επισήμανσης για έναν σύνδεσμο μπορεί να είναι αρκετά κουραστική διαδικασία. Το GTK-Doc σας βοηθάει, παρέχοντάς σας μια σειρά από χρήσιμες συντομεύσεις. Χρησιμοποιήστε το function() για να αναφερθείτε σε συναρτήσεις ή μακροεντολές που δέχονται ορίσματα. @@ -418,43 +455,49 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html Το DocBook μπορεί να κάνει παραπάνω από απλούς συνδέσμους. Μπορεί κάποιος να έχει και λίστες, παραδείγματα, κεφαλίδες και εικόνες. Από την έκδοση 1.20 και μετά, ο προτιμώμενος τρόπος είναι με τη χρήση ενός υποσυνόλου της βασικής σύνταξης για μορφοποίηση κειμένου που ονομάζεται Markdown. Σε παλιότερες εκδόσεις GTK-Doc οποιαδήποτε τεκμηρίωση που περιλαμβάνει Markdown θα αποδίδεται ως έχει. Για παράδειγμα, οι καταχωρήσεις της λίστας θα εμφανίζονται σαν γραμμές που αρχίζουν με μια παύλα. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + Σε παλιότερες εκδόσεις του GTK-Doc, αν χρειάζεστε υποστήριξη για πρόσθετη μορφοποίηση, θα πρέπει να ενεργοποιήσετε τη χρήση των ετικετών docbook SGML/XML μέσα στα doc-comments θέτοντας το ή το στη μεταβλητή MKDB_OPTIONS μέσα στο Makefile.am. Μπλοκ σχολίου GTK-Doc χρησιμοποιώντας Markdown /** - * ταυτοποιητικό: + * identifier: * - * παράγραφος τεκμηρίωσης ... + * documentation paragraph ... * - * # Υπο Κεφαλίδα # + * # Sub Heading # * - * ## Δεύτερη Υπο Κεφαλίδα + * ## Second Sub Heading * - * # Υπο Κεφαλίδα με έναν αγκυρωμένο σύνδεσμο # {#heading-two} + * # Sub Heading With a Link Anchor # {#heading-two} * - * περισσότερη τεκμηρίωση: + * more documentation: * - * - καταχώρηση λίστας 1 + * - list item 1 * - * Παράγραφος μέσα σε μια καταχώρηση λίστας. + * Paragraph inside a list item. * - * - καταχώρηση λίστας 2 + * - list item 2 * - * 1. αριθμημένη καταχώρηση λίστας + * 1. numbered list item * - * 2. μια άλλη αριθμημένη καταχώρηση λίστας + * 2. another numbered list item * - * Μια άλλη παράγραφος. [Ένας σύνδεσμος στον ιστότοπο του GNOME](http://www.gnome.org/) + * Another paragraph. [A Link to the GNOME Website](http://www.gnome.org/) * - * ![μια εικόνα inline][plot-result.png] + * ![an inline image][plot-result.png] * - * [Ένας σύνδεσμος στον παραπάνω heading anchor][heading-two] + * [A link to the heading anchor above][heading-two] * - * Ένα παράδειγμα γλώσσας-C: - * |[<!-- γλώσσα="C" --> - * GtkWidget *label = gtk_label_new ("Υπέροχη!"); + * A C-language example: + * |[<!-- language="C" --> + * GtkWidget *label = gtk_label_new ("Gorgeous!"); * ]| */ @@ -464,14 +507,14 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html Μπορείτε να βρείτε περισσότερα παραδείγματα για το ποιες ετικέτες markdown υποστηρίζονται στη διεύθυνση GTK+ Documentation Markdown Syntax Reference. - Όπως αναφέρθηκε και προηγουμένως το GTK-Doc στοχεύει στην τεκμηρίωση του δημόσιου API. Άρα, δεν μπορεί κάποιος να γράψει τεκμηρίωση για στατικά σύμβολα. Παρόλα αυτά, συνιστάται ο σχολιασμός και αυτών των συμβόλων, γιατί βοηθά στην κατανόηση του κώδικα. Σας προτείνουμε λοιπόν να τα σχολιάζετε χρησιμοποιώντας κανονικά σχόλια (χωρίς το δεύτερο «*» στην πρώτη γραμμή). Αν αργότερα χρειαστεί να μετατραπεί η συνάρτηση σε δημόσια, το μόνο που θα πρέπει να γίνει είναι να προστεθεί άλλο ένα «*» στο μπλοκ του σχολίου, και να εισαχθεί το όνομα του συμβόλου στην κατάλληλη θέση του αρχείου ενοτήτων. + Όπως αναφέρθηκε και προηγουμένως το GTK-Doc στοχεύει στην τεκμηρίωση του δημόσιου API. Άρα, δεν μπορεί κάποιος να γράψει τεκμηρίωση για στατικά σύμβολα. Παρόλα αυτά, συνιστάται ο σχολιασμός και αυτών των συμβόλων, γιατί βοηθά στην κατανόηση του κώδικα. Σας προτείνουμε λοιπόν να τα σχολιάζετε χρησιμοποιώντας κανονικά σχόλια (χωρίς το δεύτερο «*» στην πρώτη γραμμή). Αν αργότερα χρειαστεί να μετατραπεί η συνάρτηση σε δημόσια, το μόνο που θα πρέπει να γίνει είναι να προστεθεί άλλο ένα «*» στο μπλοκ του σχολίου, και να εισαχθεί το όνομα του συμβόλου στην κατάλληλη θέση του αρχείου ενοτήτων. Τεκμηρίωση ενοτήτων - Κάθε ενότητα της τεκμηρίωσης περιέχει πληροφορίες για μία κλάση ή ένα άρθρωμα. Για να εισάγετε το συστατικό μπορείτε να γράψετε ένα μπλοκ σχολίου ενότητας. Η σύντομη αυτή περιγραφή χρησιμοποιείται και για τον πίνακα περιεχομένων. Όλα τα πεδία @fields είναι προαιρετικά. + Κάθε ενότητα της τεκμηρίωσης περιέχει πληροφορίες για μια κλάση ή ένα άρθρωμα. Για να εισάγετε το συστατικό μπορείτε να γράψετε ένα μπλοκ σχολίου ενότητας. Η σύντομη αυτή περιγραφή χρησιμοποιείται και για τον πίνακα περιεχομένων. Όλα τα πεδία @fields είναι προαιρετικά. Μπλοκ σχολίου ενότητας @@ -502,7 +545,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html @short_description - Περιγραφή της ενότητας σε μία γραμμή, η οποία θα εμφανίζεται, στη συνέχεια, μετά από τους συνδέσμους του πίνακα περιεχομένων και στην αρχή της σελίδας της ενότητας. + Περιγραφή της ενότητας σε μια γραμμή, η οποία θα εμφανίζεται, στη συνέχεια, μετά από τους συνδέσμους του πίνακα περιεχομένων και στην αρχή της σελίδας της ενότητας. @@ -565,7 +608,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html Τεκμηρίωση συμβόλων - Κάθε σύμβολο (συνάρτηση, μακροεντολή, δομή, αρίθμηση, σήμα, ιδιότητα) τεκμηριώνεται σε ξεχωριστό μπλοκ. Η καταλληλότερη θέση για τα μπλοκ είναι δίπλα στους ορισμούς των συμβόλων, γιατί διευκολύνει το έργο συγχρονισμού. Επομένως, η τεκμηρίωση των συναρτήσεων συνήθως βρίσκεται στο αρχείο του πηγαίου κώδικα, ενώ των μακροεντολών, δομών και αριθμήσεων στο αρχείο κεφαλίδας. + Κάθε σύμβολο (συνάρτηση, μακροεντολή, δομή, αρίθμηση, σήμα, ιδιότητα) τεκμηριώνεται σε ξεχωριστή ομάδα. Η καταλληλότερη θέση για τις ομάδες είναι δίπλα στους ορισμούς των συμβόλων, γιατί διευκολύνει το έργο συγχρονισμού. Επομένως, η τεκμηρίωση των συναρτήσεων συνήθως βρίσκεται στο αρχείο του πηγαίου κώδικα, ενώ των μακροεντολών, δομών και αριθμήσεων στο αρχείο κεφαλίδας. Γενικές ετικέτες @@ -584,20 +627,20 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : Πληροφορίες σταθερότητας) - + (FIXME : Πληροφορίες σταθερότητας) + Γενικές ετικέτες /** * foo_get_bar: * @foo: some foo * - * Ανάκτηση του @foo's bar. + * Retrieves @foo's bar. * - * Επιστρέφει: @foo's bar + * Returns: @foo's bar * - * Από το: 2.6 - * Παρωχημένο: 2.12: Χρησιμοποιείστε το foo_baz_get_bar() στη θέση του. + * Since: 2.6 + * Deprecated: 2.12: Use foo_baz_get_bar() instead. */ Bar * foo_get_bar(Foo *foo) @@ -607,11 +650,43 @@ foo_get_bar(Foo *foo) - Μπλοκ σχολίου συνάρτησης + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + + Ομάδα σχολίων συνάρτησης Παρακαλούμε να θυμηθείτε να: - Τεκμηριώσετε κατά πόσο τα επιστρεφόμενα αντικείμενα, λίστες, συμβολοσειρές, κ.λπ, θα πρέπει να ελευθερώνονται, να μην ελευθερώνονται ή να απορρίπτονται. + Τεκμηριώστε κατά πόσο τα επιστρεφόμενα αντικείμενα, λίστες, συμβολοσειρές, κ.λπ, θα πρέπει να ελευθερώνονται, να μην ελευθερώνονται ή να απορρίπτονται. Τεκμηριώσετε κατά πόσο οι παράμετροι μπορούν να είναι μηδενικές (NULL) και τι συμβαίνει αν είναι. @@ -623,54 +698,51 @@ foo_get_bar(Foo *foo) Το Gtk-doc θεωρεί ότι όλα τα σύμβολα (μακροεντολές, συναρτήσεις, κτλ.) που ξεκινούν με '_' είναι ιδιωτικά και τα μεταχειρίζεται σαν στατικές συναρτήσεις. - Επίσης, ρίξτε μια ματιά στις ετικέτες σημείωσης ενδοσκόπησης: http://live.gnome.org/GObjectIntrospection/Annotations - - Μπλοκ σχολίου συνάρτησης + Ομάδα σχολίων συνάρτησης /** * function_name: - * @par1: περιγραφή της παραμέτρου 1. Αυτά μπορουν να επεκταθούν επί πολύ περισσότερο από - * μια γραμμή. - * @par2: περιγραφή της παραμέτρου 2 - * @...: a %NULL-terminated λίστα γραμμών + * @par1: description of parameter 1. These can extend over more than + * one line. + * @par2: description of parameter 2 + * @...: a %NULL-terminated list of bars * - * Η περιγραφή παραμέτρου πηγαίνει εδώ. Μπορείτε να χρησιμοποιήσετε το @par1 για να αναφερθείτε στις παραμέτρους - * έτσι ώστε να τονίζονται έντονα στην έξοδο. Μπορείτε επίσης να χρησιμοποιήσετε το %constant - * για τις σταθερές, το function_name2() για τις συναρτήσεις και το #GtkWidget για συνδέσμους σε - * άλλες δηλώσεις (που μπορεί να τεκμηριώνονται αλλού). + * The function description goes here. You can use @par1 to refer to parameters + * so that they are highlighted in the output. You can also use %constant + * for constants, function_name2() for functions and #GtkWidget for links to + * other declarations (which may be documented elsewhere). * - * Επιστρέφει: έναν ακέραιο. + * Returns: an integer. * - * Από την: 2.2 - * Παρωχημένη: 2.18: Χρησιμοποιήστε αντιθέτως μια άλλη_συνάρτηση(). + * Since: 2.2 + * Deprecated: 2.18: Use other_function() instead. */ - Ετικέτες συναρτήσεων - Returns: + Επιστροφές: Παράγραφος που περιγράφει το επιστρεφόμενο αποτέλεσμα. @...: - Σε περίπτωση που η μεταβλητή μπορεί να δεχθεί μεταβλητό αριθμό ορισμάτων (variadic), πρέπει να χρησιμοποιήσετε αυτή την ετικέτα (η ετικέτα @Varargs: λειτουργεί επίσης, για ιστορικούς λόγους). + Σε περίπτωση που η συνάρτηση μπορεί να δεχθεί μεταβλητό αριθμό ορισμάτων (variadic), πρέπει να χρησιμοποιήσετε αυτή την ετικέτα (η ετικέτα @Varargs: λειτουργεί επίσης, για ιστορικούς λόγους). - Μπλοκ σχολίου ιδιότητας + Ομάδα σχολίων ιδιότητας - Μπλοκ σχολίου ιδιότητας + Ομάδα σχολίων ιδιότητας /** * SomeWidget:some-property: * - * Εδώ μπορείτε να τεκμηριώσετε μια ιδιότητα. + * Here you can document a property. */ g_object_class_install_property (object_class, PROP_SOME_PROPERTY, ...); @@ -678,7 +750,7 @@ g_object_class_install_property (object_class, PROP_SOME_PROPERTY, ...); - Μπλοκ σχολίου σήματος + Ομάδα σχολίων σήματος Παρακαλούμε να θυμηθείτε να: @@ -689,7 +761,7 @@ g_object_class_install_property (object_class, PROP_SOME_PROPERTY, ...); - Μπλοκ σχολίου σήματος + Ομάδα σχολίων σήματος /** * FooWidget::foobarized: @@ -697,7 +769,7 @@ g_object_class_install_property (object_class, PROP_SOME_PROPERTY, ...); * @foo: some foo * @bar: some bar * - * Το ::foobar-οποιημένο σήμα εκπέμπεται κάθε φορά που κάποιος προσπαθεί να foobar-οποιήσει το @widget. + * The ::foobarized signal is emitted each time someone tries to foobarize @widget. */ foo_signals[FOOBARIZE] = g_signal_new ("foobarize", @@ -707,14 +779,14 @@ foo_signals[FOOBARIZE] = - Μπλοκ σχολίου δομής - Μπλοκ σχολίου δομής + Ομάδα σχολίων δομής + Ομάδα σχολίων δομής /** * FooWidget: * @bar: some #gboolean * - * Αυτό είναι το καλύτερο widget που υπήρξε ποτέ. + * This is the best widget, ever. */ typedef struct _FooWidget { /*< private >*/ @@ -728,26 +800,26 @@ typedef struct _FooWidget { Χρησιμοποιήστε το /*< private >*/ πριν από πεδία ιδιωτικών δομών που θέλετε να αποκρύψετε. Χρησιμοποιήστε το /*< public >*/για την αντίστροφη συμπεριφορά. - Οι ομάδες σχολίων μιας Δομής μπορούν επίσης να χρησιμοποιηθούν για GObjects και για GObjectClasses. Είναι συνήθως καλή ιδέα να προσθέτετε μία ομάδα σχολίου για μια κλάση, εάν έχει vmethods (γιατί έτσι μπορούν να τεκμηριωθούν). Για το ίδιο το GObject μπορείτε να χρησιμοποιήσετε τα σχετικά έγγραφα τμημάτων, έχοντας μία ξεχωριστή ομάδα για το στιγμιότυπο δομής θα ήταν χρήσιμο εάν το στιγμιότυπο έχει δημόσια πεδία. Ένα μειονέκτημα εδώ είναι ότι θα δημιουργηθούν δύο καταχωρήσεις δεικτών για το ίδιο όνομα (για την δομή και για το τμήμα). + Οι ομάδες σχολίων μιας δομής μπορούν επίσης να χρησιμοποιηθούν για GObjects και για GObjectClasses. Είναι συνήθως καλή ιδέα να προσθέτετε μία ομάδα σχολίου για μια κλάση, εάν έχει vmethods (γιατί έτσι μπορούν να τεκμηριωθούν). Για το ίδιο το GObject μπορείτε να χρησιμοποιήσετε τα σχετικά έγγραφα τμημάτων, έχοντας μία ξεχωριστή ομάδα για το στιγμιότυπο δομής θα ήταν χρήσιμο εάν το στιγμιότυπο έχει δημόσια πεδία. Ένα μειονέκτημα εδώ είναι ότι θα δημιουργηθούν δύο καταχωρήσεις δεικτών για το ίδιο όνομα (για την δομή και για το τμήμα). - Μπλοκ σχολίου Enum - Μπλοκ σχολίου Enum + Ομάδα σχολίων Enum + Ομάδα σχολίων Enum /** * Something: * @SOMETHING_FOO: something foo * @SOMETHING_BAR: something bar * - * Τιμές απαρίθμησης που χρησιμοποιούνται για το πράγμα, για τον ορισμό του πράγματος. + * Enum values used for the thing, to specify the thing. */ typedef enum { SOMETHING_FOO, SOMETHING_BAR, /*< private >*/ SOMETHING_COUNT -} Something· +} Something; @@ -765,7 +837,7 @@ typedef enum { <link linkend="glib-Hash-Tables">Hash Tables</link> - Ο προορισμός είναι το id του SGML/XML στο πρώτο στοιχείο της σελίδας στην οποία παραπέμπει ο σύνδεσμος. Για τις περισσότερες σελίδες είναι το ("gtk", "gdk", glib"), ακολουθούμενο από τον τίτλο της σελίδας («Πίνακες Hash»). Για τα γραφικά συστατικά είναι το όνομα της κλάσης. Τα διαστήματα και τα «_» μετατρέπονται σε «-» για να υπάρχει συμμόρφωση με το SGML/XML. + Ο προορισμός είναι το αναγνωριστικό του SGML/XML στο πρώτο στοιχείο της σελίδας στην οποία παραπέμπει ο σύνδεσμος. Για τις περισσότερες σελίδες είναι το ("gtk", "gdk", glib"), ακολουθούμενο από τον τίτλο της σελίδας ("Πίνακες Hash"). Για τα γραφικά συστατικά είναι το όνομα της κλάσης. Τα διαστήματα και τα «_» μετατρέπονται σε «-» για να υπάρχει συμμόρφωση με το SGML/XML. Αναφορά σε εξωτερική συνάρτηση, π.χ. τυποποιημένη συνάρτηση C: @@ -776,7 +848,7 @@ typedef enum { Συμπερίληψη παραδειγμάτων κώδικα: <example> - <title>Χρησιμοποιώντας έναν πίνακα GHashTable.</title> + <title>Using a GHashTable.</title> <programlisting> ... </programlisting> @@ -790,9 +862,9 @@ typedef enum { </programlisting> </informalexample> - . Στην τελευταία περίπτωση το GTK-Doc υποστηρίζει επίσης τη σύντμηση: |[ ... ]| + . Στην τελευταία περίπτωση το GTK-Doc υποστηρίζει επίσης μια συντόμευση: |[ ... ]| - Συμπερίληψη λιστών με κουκίδες: + Συμπερίληψη λιστών με κουκκίδες: <itemizedlist> <listitem> @@ -813,7 +885,7 @@ typedef enum { <note> <para> - Βεβαιωθείτε πως απελυεθερώνετε τα δεδομένα μετά τη χρήση. + Make sure you free the data after use. </para> </note> @@ -821,7 +893,7 @@ typedef enum { Για να αναφερθείτε σε έναν τύπο: -<type>μη υπογεγραμμένος χαρακτήρας char</type> +<type>unsigned char</type> @@ -841,11 +913,11 @@ typedef enum { <classname>GtkWidget</classname> - , αλλά μάλλον θα χρησιμοποιήσετε το #GtkWidget (για αυτόματη δημιουργία συνδέσμου προς τη σελίδα GtkWidget, δείτε τις συντμήσεις). + , αλλά μάλλον θα χρησιμοποιήσετε το #GtkWidget (για αυτόματη δημιουργία συνδέσμου προς τη σελίδα GtkWidget, δείτε τις συντομεύσεις). Χρήση έντονων χαρακτήρων: -<emphasis>Αυτό είναι σημαντικό;/emphasis> +<emphasis>This is important</emphasis> @@ -887,7 +959,7 @@ gtk_arrow_get_type - Από την έκδοση 1.8 και μετά το gtkdoc-scan μπορεί να παράγει αυτόματα αυτή τη λίστα. Απλά προσθέστε την επιλογή «--rebuild-types» στο SCAN_OPTIONS του Makefile.am. Αν προτιμήσετε αυτή την προσέγγιση, θα πρέπει να μη συμπεριλάβετε το αρχείο types ούτε στη διανομή ούτε στον έλεγχο εκδόσεων. + Από την έκδοση 1.8 και μετά το gtkdoc-scan μπορεί να παράγει αυτόματα αυτή τη λίστα. Απλά προσθέστε την επιλογή "--rebuild-types" στο SCAN_OPTIONS του Makefile.am. Αν προτιμήσετε αυτή την προσέγγιση, θα πρέπει να μη συμπεριλάβετε το αρχείο types ούτε στη διανομή ούτε στον έλεγχο εκδόσεων. @@ -899,19 +971,19 @@ gtk_arrow_get_type Αν και το GTK-Doc παράγει αυτόματα ένα πρότυπο κύριο έγγραφο, δεν το τροποποιεί κατά τις επόμενες εκτελέσεις. Αυτό σημαίνει ότι έχετε τη δυνατότητα να αλλάξετε τη δομή της τεκμηρίωσης. Μπορείτε να ομαδοποιήσετε κάποιες σελίδες ή να προσθέσετε νέες. Το GTK-Doc διαθέτει πλέον μια σουίτα για δοκιμές, στην οποία το κύριο έγγραφο παράγεται εκ νέου. Συνιστάται να επαναλαμβάνετε τακτικά αυτή τη διαδικασία, για να διαπιστώνετε αν έχουν προστεθεί νέα στοιχεία. - Μη δημιουργείτε νέα έγγραφα για τους οδηγούς εκμάθησης (tutorials). Απλά προσθέστε τους ως επιπλέον κεφάλαια, δηλαδή ενσωματώστε απευθείας τον οδηγό εκμάθησης για μια βιβλιοθήκη στην τεκμηρίωση API. Το πλεονέκτημα είναι ότι έτσι διευκολύνεται η διαδικασία δημιουργίας συνδέσμων από τον οδηγό εκμάθησης προς την τεκμηρίωση των συμβόλων. Επίσης, έτσι καθίσταται πιθανότερη η ενημέρωση του οδηγού μαζί με τη βιβλιοθήκη. + Μη δημιουργείτε εγχειρίδια ως νέα έγγραφα. Απλά προσθέστε επιπλέον κεφάλαια. Το όφελος της ενσωμάτωσης απευθείας του εγχειριδίου για μια βιβλιοθήκη στην τεκμηρίωση API είναι ότι έτσι διευκολύνεται η διαδικασία δημιουργίας συνδέσμων από το εγχειρίδιο προς την τεκμηρίωση των συμβόλων. Επίσης, έτσι καθίσταται πιθανότερη η ενημέρωση του εγχειριδίου μαζί με τη βιβλιοθήκη. - Ποιες είναι λοιπόν οι αλλαγές που πρέπει να γίνουν στο κύριο έγγραφο; Διευκρινίζουμε ότι πρόκειται για λίγες μόνο αλλαγές σε ορισμένα placeholders (κείμενα εντός αγκυλών). + Ποιες είναι λοιπόν οι αλλαγές που πρέπει να γίνουν στο κύριο έγγραφο; Πρόκειται για λίγες μόνο αλλαγές σε ορισμένα placeholders (κείμενα εντός αγκυλών) που πρέπει να διευκρινήσετε. Κεφαλίδα κύριου εγγράφου <bookinfo> - <title>MODULENAME Εγχειρίδιο αναφοράς;/title> + <title>MODULENAME Reference Manual</title> <releaseinfo> - για το MODULENAME [ΕΚΔΟΣΗ] - Η πιο πρόσφατη έκδοση αυτή της τεκμηρίωσης μπορούν να εντοπισθούν on-line στη διεύθυνση + for MODULENAME [VERSION] + The latest version of this documentation can be found on-line at <ulink role="online-location" url="http://[SERVER]/MODULENAME/index.html">http://[SERVER]/MODULENAME/</ulink>. </releaseinfo> </bookinfo> @@ -933,7 +1005,7 @@ gtk_arrow_get_type Η ετικέτα <FILE> ... </FILE> χρησιμοποιείται για να δηλώσει το όνομα του αρχείου χωρίς οποιοδήποτε επίθεμα. Για παράδειγμα, το '<FILE>gnome-config</FILE>' σημαίνει ότι οι δηλώσεις των ενοτήτων θα βρίσκονται στο πρότυπο αρχείο tmpl/gnome-config.sgml, το οποίο θα μετατραπεί στο αρχείο DocBook SGML/XML sgml/gnome-config.sgml ή DocBook XML xml/gnome-config.xml. (Το όνομα του αρχείου HTML βασίζεται στο όνομα του αρθρώματος και τον τίτλο της ενότητας, ή για τα GObjects βασίζεται στο όνομα κλάσης GObjects που μετατράπηκε σε πεζά γράμματα). - Η ετικέτα <TITLE> ... </TITLE> χρησιμοποιείται για να ορίσει τους τίτλους των ενοτήτων. Χρησιμεύει μόνο πριν τη δημιουργία των προτύπων, καθώς ο τίτλος που περιέχεται στα αρχεία προτύπων αντικαθιστά αυτούς τους τίτλους. Επίσης, αν χρησιμοποιείται το σχόλιο SECTION στον πηγαίο κώδικα, αυτό είναι πεπαλαιωμένο. + Η ετικέτα <TITLE> ... </TITLE> χρησιμοποιείται για να ορίσει τους τίτλους των ενοτήτων. Χρησιμεύει μόνο πριν τη δημιουργία των προτύπων, καθώς ο τίτλος που περιέχεται στα αρχεία προτύπων αντικαθιστά αυτούς τους τίτλους. Επίσης, αν χρησιμοποιείται το σχόλιο SECTION στον πηγαίο κώδικα, αυτό είναι παρωχημένο. Μπορείτε να ομαδοποιήσετε στοιχεία στην ενότητα χρησιμοποιώντας την ετικέτα <SUBSECTION>. Με την τωρινή της μορφή, εμφανίζει μία κενή γραμμή μεταξύ υποενοτήτων στη συνοπτική παρουσίαση. Μπορείτε επίσης να χρησιμοποιήσετε την <SUBSECTION Standard> για κλασικές δηλώσεις GObject (π.χ. συναρτήσεις όπως η g_object_get_type και μακροεντολές όπως οι G_OBJECT(), G_IS_OBJECT(), κτλ.). Προς το παρόν αυτές οι δηλώσεις μένουν εκτός τεκμηρίωσης. Μπορείτε να χρησιμοποιήσετε την ετικέτα <SUBSECTION Private> για ιδιωτικές δηλώσεις που δεν πρόκειται να εμφανιστούν στην τεκμηρίωση (έτσι αποφεύγετε τις προειδοποιήσεις για δηλώσεις που δεν χρησιμοποιούνται). Αν η βιβλιοθήκη σας περιέχει ιδιωτικούς τύπους, για τους οποίους δεν επιθυμείτε να εμφανίζονται στην ιεραρχία αντικειμένων και στη λίστα υλοποιημένων ή απαιτούμενων διεπαφών, προσθέσετε τους σε μία ιδιωτική υποενότητα. Αν θα τοποθετήσετε κλάσεις GObject και GObjectClass σε δημόσιες ή κλασσικές ενότητες εξαρτάται από το αν έχετε δημόσιες καταχωρήσεις (μεταβλητές,vmethods). @@ -955,7 +1027,7 @@ gtk_arrow_get_type Το αρχείο <package>-unused.txt περιέχει ονόματα συμβόλων για τα οποία η σάρωση του GTK-Doc βρήκε τεκμηρίωση, αλλά δεν γνωρίζει πού να την τοποθετήσει. Aυτό σημαίνει ότι τα σύμβολα δεν έχουν προστεθεί ακόμη στο αρχείο <package>-sections.txt. - Ενεργοποιήστε ή προσθέστε τη γραμμή στο Makefile.am. Αν έχετε εγκατεστημένη την έκδοση 1.9 ή μεταγενέστερη, θα πραγματοποιεί διάφορους ελέγχους κατά την εκτέλεση του make check. + Ενεργοποιήστε ή προσθέστε τη γραμμή στο Makefile.am. Αν έχετε εγκατεστημένη την έκδοση GTK-Doc 1.9 ή μεταγενέστερη, θα πραγματοποιεί διάφορους ελέγχους κατά την εκτέλεση του make check. Μπορείτε επίσης να δείτε τα αρχεία που παράγονται από το σαρωτή του πηγαίου κώδικα: <package>-decl-list.txt και <package>-decl.txt. Το πρώτο μπορεί να συγκριθεί με το αρχείο της ενότητας, αν αυτό συντηρείται χειροκίνητα. Το δεύτερο περιέχει όλες τις δηλώσεις από τις κεφαλίδες. Αν ένα σύμβολο λείπει μπορείτε να ελέγξετε αν περιέχεται σε αυτό το αρχείο. @@ -966,28 +1038,36 @@ gtk_arrow_get_type Εκσυγχρονίζοντας την τεκμηρίωση - Το GTK-Doc κυκλοφορεί εδώ και αρκετό καιρό. Σε αυτό το κεφάλαιο θα παραθέσουμε τα νέα χαρακτηρηστικά μαζί με την έκδοση στην οποία είναι διαθέσιμα. + Το GTK-Doc κυκλοφορεί εδώ και αρκετό καιρό. Σε αυτό το κεφάλαιο θα παραθέσουμε τις νέες λειτουργίες μαζί με την έκδοση στην οποία είναι διαθέσιμες. GTK-Doc 1.9 Όταν χρησιμοποιείτε το xml αντί για το sgml, μπορείτε πράγματι να ονομάσετε το κύριο έγγραφο <package>-docs.xml. - Αυτή η έκδοση υποστηρίζει στο Makefile.am. Αν αυτό ενεργοποιηθεί, το <package>-sections.txt αυτοδημιουργείται και μπορεί να αφαιρεθεί από το vcs. Αυτό λειτουργεί ωραία μόνο για έργα που έχουν μια πολύ κανονική δομή (π.χ. το κάθε ζεύγος .{c,h} θα δημιουργεί μια νέα ενότητα). Αν κάποιος οργανώσει ένα έργο κοντά σε αυτό, τότε η ενημέρωση μιας ενότητας αρείων που συντηρούνται χειρονακτικά μπορεί να είναι τόσο απλή όσο και το να εκτελούμε meld <package>-decl-list.txt <package>-sections.txt. + Αυτή η έκδοση υποστηρίζει στο Makefile.am. Αν αυτό ενεργοποιηθεί, το <package>-sections.txt αυτοδημιουργείται και μπορεί να αφαιρεθεί από το vcs. Αυτό λειτουργεί καλά μόνο για έργα που έχουν μια πολύ κανονική δομή (π.χ. το κάθε ζεύγος .{c,h} θα δημιουργεί μια νέα ενότητα). Αν κάποιος οργανώσει ένα έργο κοντά σε αυτό, τότε η ενημέρωση μιας ενότητας αρχείων που συντηρούνται χειρονακτικά μπορεί να είναι τόσο απλή όσο και το να εκτελούμε meld <package>-decl-list.txt <package>-sections.txt. - Η εκδοση 1.8 εισήγαγε ήδη τη σύνταξη για τις ενότητες τεκμηρίωσης στις πηγές, αντί για τα ξεχωριστά αρχεία, κάτω από το tmpl. Αυτή η έκδοση προσθέτει επιλογές για τη μετατροπή ολόκληρου του αρθρώματος doc ώστε να μη χρησιμοποιεί καθόλου το επιπλέον στάδιο tmpl build, με τη χρήση της επιλογής στο configure.ac. + + Version 1.8 already introduced the syntax for documenting sections in + the sources instead of the separate files under tmpl. + This version adds options to switch the whole doc module to not use the + extra tmpl build step at all, by using + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. + GTK-Doc 1.10 - Αυτή η έκδοση υποστηρίζει τα στο Makefile.am. Αν αυτό ενεργοποιηθεί, το <package>.types αυτοδημιουργείται και μπορεί να αφαιρεθεί από το vcs. Όταν χρησιμοποιείτε αυτό το χαρακτηριστικό είναι σημαντικό να ρυθμίσετε και το IGNORE_HFILES στο Makefile.am για τον κώδικα που δημιουργείται υπό όρους. + Αυτή η έκδοση υποστηρίζει τα στο Makefile.am. Αν αυτό ενεργοποιηθεί, το <package>.types αυτοδημιουργείται και μπορεί να αφαιρεθεί από το vcs. Όταν χρησιμοποιείτε αυτή τη λειτουργία είναι σημαντικό να ρυθμίσετε και το IGNORE_HFILES στο Makefile.am για τον κώδικα που δομείται υπό όρους. GTK-Doc 1.16 - Αυτή η έκδοση περιλαμβάνει ένα νέο εργαλείο που λέγεται gtkdoc-check. Αυτό το εργαλείο μπορέι να εκτελεί ένα σύνολο ελέγχων υγείας στην τεκμηρίωσή σας. Ενεργοποιείται προσθέτοντας αυτές τις γραμμές στο τέλος του Makefile.am. Ενεργοποίηση του gtkdoc-check + Αυτή η έκδοση περιλαμβάνει ένα νέο εργαλείο που λέγεται gtkdoc-check. Αυτό το εργαλείο μπορέι να εκτελεί ένα σύνολο ελέγχων στην τεκμηρίωσή σας. Ενεργοποιείται προσθέτοντας αυτές τις γραμμές στο τέλος του Makefile.am. Ενεργοποίηση του gtkdoc-check if ENABLE_GTK_DOC TESTS_ENVIRONMENT = \ @@ -1002,19 +1082,19 @@ endif GTK-Doc 1.20 - Η έκδοση 1.18 έφερε μια αρχική υποστήριξη για το markdown. Η χρήση markdown στα σχόλια του doc είναι λιγότερο ενοχλητική από το να γράφει κανείς docbook xml. Αυτή η έκδοση επιφέρει μεγάλες βελτιώσεις σε αυτό, και σε πολλές άλλες τεχνοτροπίες (styles). Η ενότητα που εξηγεί τη σύνταξη σχολίων έχει όλες τις λεπτομέρειες. + Η έκδοση 1.18 έφερε μια αρχική υποστήριξη για το markdown. Η χρήση markdown στα σχόλια του doc είναι λιγότερο ενοχλητική από το να γράφει κανείς docbook xml. Αυτή η έκδοση επιφέρει μεγάλες βελτιώσεις σε αυτό και προσθέτει περισσότερα στυλ. Η ενότητα που εξηγεί τη σύνταξη σχολίων έχει όλες τις λεπτομέρειες. Τεκμηρίωση άλλων διεπαφών - Μέχρ τώρα, χρησιμοποιούσαμε το GTK-Doc για να καταγράφουμε το API του κώδικα. Οι επόμενες συνεδρίες περιέχουν προτάσεις για το πώς τα εργαλεία μπορούν να χρησιμοποιηθούν για να καταγράφετε και άλλες επιφάνειες. + Μέχρ τώρα, χρησιμοποιούσαμε το GTK-Doc για να καταγράφουμε το API του κώδικα. Οι επόμενες συνεδρίες περιέχουν προτάσεις για το πώς τα εργαλεία μπορούν να χρησιμοποιηθούν για να καταγράφετε και άλλες διεπαφές. Επιλογές γραμμής εντολών και σελίδες τεκμηρίωσης man - Δεδομένου ότι κάποιος μπορεί να παραγάγει σελίδες man για ένα docbook refentry επίσης, θα ήταν καλή ιδέα να χρησιμοποιηθεί και για αυτόν τον σκοπό. Με αυτόν τον τρόπο η διεπαφή γίνεται μέρος της αναφοράς και αποχτά την σελίδα-man δωρεάν. + Δεδομένου ότι κάποιος μπορεί να παραγάγει σελίδες man για ένα docbook refentry επίσης, θα ήταν καλή ιδέα να χρησιμοποιηθεί και για αυτόν τον σκοπό. Με αυτόν τον τρόπο η διεπαφή γίνεται μέρος της αναφοράς και αποκτά δωρεάν την σελίδα-man. Τεκμηρίωση του εργαλείου @@ -1026,11 +1106,11 @@ endif Προσθήκη του έξτρα ελέγχου διαμόρφωσης - Έξτρα έλεγχοι διαμόρφωσης + Επιπλέον έλεγχοι ρυθμίσεων AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man], - [αναδημιουργία σελίδων βοήθειας man από το Docbook [default=no]])],enable_man=yes, + [regenerate man pages from Docbook [default=no]])],enable_man=yes, enable_man=no) AC_PATH_PROG([XSLTPROC], [xsltproc]) @@ -1044,7 +1124,7 @@ AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) Προσθήκη των επιπλέον κανόνων makefile - Έξτρα έλεγχοι διαμόρφωσης + Επιπλέον έλεγχοι ρυθμίσεων man_MANS = \ meeper.1 @@ -1099,7 +1179,7 @@ EXTRA_DIST += meep.xml Δεν υπάρχουν σύνδεσμοι μεταξύ των συμβόλων και των κατάλληλων ενοτήτων της τεκμηρίωσης. - Το doc-comment χρησιμοποιεί σωστά τις ετικέτες (έχουν προστεθεί #,% ή ()); Ελέγξτε αν το gtkdoc-fixxref προειδοποιεί για ανεπίλυτα xrefs. + Το doc-comment χρησιμοποιεί σωστά τις επισημάνσεις (έχουν προστεθεί #,% ή ()); Ελέγξτε αν το gtkdoc-fixxref προειδοποιεί για ανεπίλυτα xrefs. Μια νέα κλάση δεν εμφανίζεται στην τεκμηρίωση. @@ -1111,7 +1191,7 @@ EXTRA_DIST += meep.xml Λείπει ένας τύπος από την ιεραρχία κλάσεων. - Αν ο τύπος υπάρχει στο <package>.hierarchy αλλά όχι στο xml/tree_index.sgml τότε ελέγξτε ξανά ότι ο τύπος είναι σωστά τοποθετημένος στο <package>-sections.txt. Αν η περίσταση του τύπου (π.χ. GtkWidget) δεν είναι καταχωρημένη, ή είναι κατά λάθος σημειωμένη ως ιδιωτική, τότε δε θα εμφανιστεί. + Αν ο τύπος υπάρχει στο <package>.hierarchy αλλά όχι στο xml/tree_index.sgml τότε ελέγξτε ξανά ότι ο τύπος είναι σωστά τοποθετημένος στο <package>-sections.txt. Αν ο τύπος του παραδείγματος (π.χ. GtkWidget) δεν είναι καταχωρημένος, ή είναι κατά λάθος σημειωμένος ως ιδιωτικός, τότε δε θα εμφανιστεί. Λαμβάνω συνδέσμους foldoc για όλες τις σημειώσεις gobject. @@ -1126,11 +1206,11 @@ EXTRA_DIST += meep.xml - Πολλαπλά "IDs" για τον προορισμό συνδέσμου: XYZ - Το σύμβολο XYZ εμφανίζεται δύο φορές στο <package>-sections.txt. + Πολλαπλά "Αναγνωριστικά" για τον προορισμό συνδέσμου: XYZ + Το σύμβολο XYZ εμφανίζεται δύο φορές στο αρχείο <package>-sections.txt. - Βρέθηκε το όνομα τύπου του στοιχείου στο namespace '', αλλά δεν αντιστοιχεί σε κανένα πρότυπο. + Βρέθηκε το όνομα τύπου του στοιχείου στην ονοματοθεσία '', αλλά δεν αντιστοιχεί σε κανένα πρότυπο. @@ -1161,7 +1241,7 @@ EXTRA_DIST += meep.xml
Free Software Foundation, Inc. 51 Franklin Street, Suite 330, Boston, MA - 02110-1301 USA
Επιτρέπεται σε όλους η αντιγραφή και διανομή ακριβούς αντιγράφου του κειμένου αυτής της άδειας αλλά απαγορεύεται η αλλοίωσή του περιεχομένου του. + 02110-1301 USA Επιτρέπεται σε όλους η αντιγραφή και διανομή ακριβούς αντιγράφου του κειμένου αυτής της άδειας αλλά απαγορεύεται η αλλοίωση του περιεχομένου του. Άδεια Ελεύθερης Τεκμηρίωσης GNU (GFDL) @@ -1186,9 +1266,9 @@ EXTRA_DIST += meep.xml Τα Κείμενα Εξωφύλλου είναι σύντομα αποσπάσματα κειμένου που αναφέρονται ρητώς ως Κείμενα Εμπροσθοφύλλου ή Κείμενα Οπισθοφύλλου στην ένδειξη όπου αναφέρεται ότι το Έγγραφο δημοσιεύεται υπό τους όρους αυτής της Άδειας. - Ως Διαφανές αντίγραφο του Εγγράφου θεωρείται κάθε αντίγραφο σε μορφή αναγνώσιμη από μηχανή, όταν συντρέχουν οι εξής προϋποθέσεις: Οι τεχνικές προδιαγραφές τις μορφής αυτής είναι διαθέσιμες για δημόσια χρήση· τα περιεχόμενα του αντιγράφου μπορούν να προβληθούν και να τύχουν επεξεργασίας άμεσα και απλά, με χρήση γενόσημων επεξεργαστών κειμένου ή ( για εικόνες αποτελούμενες από εικονοστοιχεία) γενόσημων προγραμμάτων ζωγραφικής ή (για σχέδια) ευρέως διαθέσιμων επεξεργαστών σχεδίων· το αντίγραφο είναι κατάλληλο για είσοδο σε μορφοποιητές κειμένου ή για αυτόματη μετάφραση σε ποικίλες μορφές κατάλληλες για είσοδο σε μορφοποιητές κειμένου. Δεν θεωρείται Διαφανές ένα αντίγραφο σε Διαφανή, κατά τα λοιπά, μορφή αρχείου, του οποίου η σήμανση έχει σχεδιαστεί κατά τρόπο που να αποτρέπει ή να αποθαρρύνει τη μελλοντική τροποποίηση του αντιγράφου από τους αναγνώστες. Το αντίγραφο που δεν είναι Διαφανές ονομάζεται Αδιαφανές. + Ως Διαφανές αντίγραφο του Εγγράφου θεωρείται κάθε αντίγραφο σε μορφή αναγνώσιμη από μηχανή, όταν συντρέχουν οι εξής προϋποθέσεις: Οι τεχνικές προδιαγραφές τις μορφής αυτής είναι διαθέσιμες για δημόσια χρήση· τα περιεχόμενα του αντιγράφου μπορούν να προβληθούν και να τύχουν επεξεργασίας άμεσα και απλά, με χρήση γενόσημων επεξεργαστών κειμένου ή ( για εικόνες αποτελούμενες από εικονοστοιχεία) γενόσημων προγραμμάτων ζωγραφικής ή (για σχέδια) ευρέως διαθέσιμων επεξεργαστών σχεδίων· το αντίγραφο είναι κατάλληλο για είσοδο σε μορφοποιητές κειμένου ή για αυτόματη μετάφραση σε ποικίλες μορφές κατάλληλες για είσοδο σε μορφοποιητές κειμένου. Δεν θεωρείται Διαφανές ένα αντίγραφο σε Διαφανή, κατά τα λοιπά, μορφή αρχείου, του οποίου η επισήμανση έχει σχεδιαστεί κατά τρόπο που να αποτρέπει ή να αποθαρρύνει τη μελλοντική τροποποίηση του αντιγράφου από τους αναγνώστες. Το αντίγραφο που δεν είναι Διαφανές ονομάζεται Αδιαφανές. - Παραδείγματα μορφών κατάλληλων για τη δημιουργία Διαφανών αντιγράφων είναι η απλή ASCII χωρίς σήμανση, η μορφή εισόδου Texinfo, η μορφή εισόδου LaTeX, η SGML ή XML που χρησιμοποιούν δημοσίως διαθέσιμη DTD, και η HTML που συμμορφώνεται με πρότυπα και έχει σχεδιαστεί για τροποποίηση από τον άνθρωπο. Στις Αδιαφανείς μορφές συμπεριλαμβάνονται η PostScript, η PDF, οι ιδιοταγείς μορφές που αναγιγνώσκονται μόνο από ιδιοταγείς επεξεργαστές κειμένου, η SGML ή XML των οποίων η DTD και/ή τα εργαλεία επεξεργασίας δεν είναι δημοσίως διαθέσιμα, και η HTML με αποκλειστικό προορισμό την έξοδο που παράγουν μηχανοκίνητα ορισμένοι επεξεργαστές κειμένου. + Παραδείγματα μορφών κατάλληλων για τη δημιουργία Διαφανών αντιγράφων είναι η απλή ASCII χωρίς επισήμανση, η μορφή εισόδου Texinfo, η μορφή εισόδου LaTeX, η SGML ή XML που χρησιμοποιούν δημοσίως διαθέσιμη DTD, και η HTML που συμμορφώνεται με πρότυπα και έχει σχεδιαστεί για τροποποίηση από τον άνθρωπο. Στις Αδιαφανείς μορφές συμπεριλαμβάνονται η PostScript, η PDF, οι ιδιοταγείς μορφές που αναγιγνώσκονται μόνο από ιδιοταγείς επεξεργαστές κειμένου, η SGML ή XML των οποίων η DTD και/ή τα εργαλεία επεξεργασίας δεν είναι δημοσίως διαθέσιμα, και η HTML με αποκλειστικό προορισμό την έξοδο που παράγουν μηχανοκίνητα ορισμένοι επεξεργαστές κειμένου. Ως Σελίδα Τίτλου θεωρείται, για τα έντυπα βιβλία, η σελίδα τίτλου αυτή καθαυτή, καθώς και τυχόν επόμενες σελίδες που απαιτούνται για την ευανάγνωστη συμπερίληψη του υλικού που οφείλει να εμφανίζεται στη σελίδα τίτλου σύμφωνα με την παρούσα Άδεια. Για τα έργα σε μορφές που δεν περιλαμβάνουν σελίδα τίτλου αυτή καθαυτή, ως Σελίδα Τίτλου θεωρείται το κείμενο που βρίσκεται κοντά στην εμφανέστερη εμφάνιση του τίτλου του έργου και το οποίο προηγείται του σώματος του κειμένου. diff --git a/help/manual/en_GB/fdl-appendix.xml b/help/manual/en_GB/fdl-appendix.xml index a6dd2ff..685ffd3 100644 --- a/help/manual/en_GB/fdl-appendix.xml +++ b/help/manual/en_GB/fdl-appendix.xml @@ -459,7 +459,13 @@ documents in all other respects. - You may extract a single document from such a collection, and distribute it individually under this Licence, provided you insert a copy of this Licence into the extracted document, and follow this Licence in all other respects regarding verbatim copying of that document. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/en_GB/index.docbook b/help/manual/en_GB/index.docbook index 49b291d..c8a1f17 100644 --- a/help/manual/en_GB/index.docbook +++ b/help/manual/en_GB/index.docbook @@ -68,11 +68,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -500,12 +506,17 @@ make Integration with version control systems - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -523,9 +534,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -561,7 +572,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -690,12 +710,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -746,16 +771,16 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - As already mentioned earlier GTK-Doc is for documenting public API. Thus - one cannot write documentation for static symbols. Nevertheless it is good - to comment those symbols too. This helps other to understand you code. - Therefore we recommend to comment these using normal comments (without the - 2nd '*' in the first line). - If later the function needs to be made public, all one needs to do is to - add another '*' in the comment block and insert the symbol name at the - right place inside the sections file. - + + As already mentioned earlier GTK-Doc is for documenting public API. Thus + one cannot write documentation for static symbols. Nevertheless it is good + to comment those symbols too. This helps other to understand you code. + Therefore we recommend to comment these using normal comments (without the + 2nd '*' in the first line). + If later the function needs to be made public, all one needs to do is to + add another '*' in the comment block and insert the symbol name at the + right place inside the sections file. + @@ -941,10 +966,10 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - (FIXME : Stability information) - - + + (FIXME : Stability information) + + General tags + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Function comment block @@ -992,13 +1049,6 @@ foo_get_bar(Foo *foo) GTK-Doc assumes all symbols (macros, functions) starting with _ are private. They are treated like static functions. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - Function comment block tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1754,7 +1806,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2008,7 +2060,13 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) 6. COLLECTIONS OF DOCUMENTS You may make a collection consisting of the Document and other documents released under this Licence, and replace the individual copies of this Licence in the various documents with a single copy that is included in the collection, provided that you follow the rules of this Licence for verbatim copying of each of the documents in all other respects. - You may extract a single document from such a collection, and distribute it individually under this Licence, provided you insert a copy of this Licence into the extracted document, and follow this Licence in all other respects regarding verbatim copying of that document. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/es/es.po b/help/manual/es/es.po index 9348289..a780e16 100644 --- a/help/manual/es/es.po +++ b/help/manual/es/es.po @@ -2,27 +2,27 @@ # Francisco Javier Fernandez Serrador , 2009, 2010 # Jorge Gonzalez , 2009. # Jorge González , 2009, 2010, 2011. -# Daniel Mustieles , 2011, 2012, 2013, 2014. +# Daniel Mustieles , 2011, 2012, 2013, 2014, 2015. # msgid "" msgstr "" "Project-Id-Version: gtk-doc-help.master\n" -"POT-Creation-Date: 2014-02-20 22:28+0000\n" -"PO-Revision-Date: 2014-02-24 17:24+0100\n" +"POT-Creation-Date: 2015-04-17 18:52+0000\n" +"PO-Revision-Date: 2015-04-23 11:14+0200\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español \n" +"Language-Team: Español; Castellano \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.5\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" msgstr "" -"Daniel Mustieles , 2009-2014\n" +"Daniel Mustieles , 2009-2015\n" "Jorge González , 2009-2011\n" "Francisco Javier F. Serrador , 2009, 2010" @@ -62,9 +62,6 @@ msgstr "" #. (itstool) path: authorgroup/author #: C/index.docbook:34 -#| msgid "" -#| "Stefan Kost " -#| "
ensonic@users.sf.net
" msgid "" "Stefan Sauer (Kost) " "
ensonic@users.sf.net
" @@ -128,16 +125,27 @@ msgstr "" #. (itstool) path: revhistory/revision #: C/index.docbook:83 msgid "" -"1.20.1 16 Feb 2014 ss1.21.1 18 Jul 2014 ss development version" msgstr "" -"1.20.1 16 de febrero de 2014 " +"1.21.1 18 de julio de 2014 " "ss versión de desarrollo" #. (itstool) path: revhistory/revision #: C/index.docbook:89 msgid "" +"1.21 17 Jul 2014 ss bug fixes, dropping deprecated features" +msgstr "" +"1.21 17 de julio de 2014 " +"ss correcciones de errores, " +"eliminadas funcionalidades obsoletas" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:95 +msgid "" "1.20 16 Feb 2014 ss bug fixes, markdown support, style improvements" @@ -147,7 +155,7 @@ msgstr "" "de marcado, mejoras en los estilos" #. (itstool) path: revhistory/revision -#: C/index.docbook:95 +#: C/index.docbook:101 msgid "" "1.19 05 Jun 2013 ss bug fixes" @@ -157,7 +165,7 @@ msgstr "" "revremark>" #. (itstool) path: revhistory/revision -#: C/index.docbook:101 +#: C/index.docbook:107 msgid "" "1.18 14 Sep 2011 ss bug fixes, speedups, markdown support" @@ -167,7 +175,7 @@ msgstr "" "mejoras en la velocidad y soporte de marcado" #. (itstool) path: revhistory/revision -#: C/index.docbook:107 +#: C/index.docbook:113 msgid "" "1.17 26 Feb 2011 sk urgent bug fix update" @@ -177,7 +185,7 @@ msgstr "" "corrección de error" #. (itstool) path: revhistory/revision -#: C/index.docbook:113 +#: C/index.docbook:119 msgid "" "1.16 14 Jan 2011 sk bugfixes, layout improvements" @@ -187,7 +195,7 @@ msgstr "" "mejoras en la distribución" #. (itstool) path: revhistory/revision -#: C/index.docbook:119 +#: C/index.docbook:125 msgid "" "1.15 21 May 2010 sk bug and regression fixes" @@ -197,7 +205,7 @@ msgstr "" "regresiones" #. (itstool) path: revhistory/revision -#: C/index.docbook:125 +#: C/index.docbook:131 msgid "" "1.14 28 March 2010 sk bugfixes and performance improvements" @@ -207,7 +215,7 @@ msgstr "" "mejoras en el rendimiento" #. (itstool) path: revhistory/revision -#: C/index.docbook:131 +#: C/index.docbook:137 msgid "" "1.13 18 December 2009 " "sk broken tarball update" #. (itstool) path: revhistory/revision -#: C/index.docbook:137 +#: C/index.docbook:143 msgid "" "1.12 18 December 2009 " "sk new tool features and " @@ -229,7 +237,7 @@ msgstr "" "nuevas características" #. (itstool) path: revhistory/revision -#: C/index.docbook:143 +#: C/index.docbook:149 msgid "" "1.11 16 November 2008 " "mal GNOME doc-utils migration" #. (itstool) path: chapter/title -#: C/index.docbook:156 +#: C/index.docbook:162 msgid "Introduction" msgstr "Introducción" #. (itstool) path: chapter/para -#: C/index.docbook:158 +#: C/index.docbook:164 msgid "" "This chapter introduces GTK-Doc and gives an overview of what it is and how " "it is used." @@ -254,12 +262,12 @@ msgstr "" "es y cómo usarlo." #. (itstool) path: sect1/title -#: C/index.docbook:164 +#: C/index.docbook:170 msgid "What is GTK-Doc?" msgstr "¿Qué es GTK-Doc?" #. (itstool) path: sect1/para -#: C/index.docbook:166 +#: C/index.docbook:172 msgid "" "GTK-Doc is used to document C code. It is typically used to document the " "public API of libraries, such as the GTK+ and GNOME libraries. But it can " @@ -270,12 +278,12 @@ msgstr "" "Pero también se puede usar para documentar código de aplicaciones." #. (itstool) path: sect1/title -#: C/index.docbook:174 +#: C/index.docbook:180 msgid "How Does GTK-Doc Work?" msgstr "¿Cómo funciona GTK-Doc?" #. (itstool) path: sect1/para -#: C/index.docbook:176 +#: C/index.docbook:182 msgid "" "GTK-Doc works by using documentation of functions placed inside the source " "files in specially-formatted comment blocks, or documentation added to the " @@ -290,7 +298,7 @@ msgstr "" "archivos de cabecera; no produce salida para funciones estáticas)." #. (itstool) path: sect1/para -#: C/index.docbook:183 +#: C/index.docbook:189 msgid "" "GTK-Doc consists of a number of perl scripts, each performing a different " "step in the process." @@ -299,12 +307,12 @@ msgstr "" "diferente en el proceso." #. (itstool) path: sect1/para -#: C/index.docbook:188 +#: C/index.docbook:194 msgid "There are 5 main steps in the process:" msgstr "Existen 5 pasos importantes en el proceso:" #. (itstool) path: listitem/para -#: C/index.docbook:195 +#: C/index.docbook:201 msgid "" "Writing the documentation. The author fills in the " "source files with the documentation for each function, macro, union etc. (In " @@ -317,7 +325,7 @@ msgstr "" "lo que ya no se recomienda)." #. (itstool) path: listitem/para -#: C/index.docbook:205 +#: C/index.docbook:211 msgid "" "Gathering information about the code. " "gtkdoc-scan scans the header files of the code " @@ -353,7 +361,7 @@ msgstr "" "txt dentro de <module>-overrides.txt." #. (itstool) path: listitem/para -#: C/index.docbook:222 +#: C/index.docbook:228 msgid "" "gtkdoc-scangobj can also be used to dynamically " "query a library about any GObject subclasses it exports. It saves " @@ -367,7 +375,7 @@ msgstr "" "que proporciona." #. (itstool) path: listitem/para -#: C/index.docbook:228 +#: C/index.docbook:234 msgid "" "gtkdoc-scanobj should not be used anymore. It was " "needed in the past when GObject was still GtkObject inside gtk+." @@ -376,7 +384,7 @@ msgstr "" "necesitó en el pasado, cuando GObject todavía era GtkObject dentro de GTK+." #. (itstool) path: listitem/para -#: C/index.docbook:235 +#: C/index.docbook:241 msgid "" "Generating the \"template\" files. gtkdoc-" "mktmpl creates a number of files in the gtkdocize supports now " @@ -407,7 +415,7 @@ msgstr "" "ejemplo, desde el sistema de control de versiones)." #. (itstool) path: listitem/para -#: C/index.docbook:256 +#: C/index.docbook:262 msgid "" "Generating the SGML/XML and HTML/PDF. " "gtkdoc-mkdb turns the template files into SGML or " @@ -427,7 +435,7 @@ msgstr "" "recomienda usar Docbook XML." #. (itstool) path: listitem/para -#: C/index.docbook:267 +#: C/index.docbook:273 msgid "" "gtkdoc-mkhtml turns the SGML/XML files into HTML " "files in the html/ subdirectory. " @@ -441,7 +449,7 @@ msgstr "" "paquete>.pdf." #. (itstool) path: listitem/para -#: C/index.docbook:273 +#: C/index.docbook:279 msgid "" "Files in sgml/ or xml/ and html/Fixing up cross-references between documents. After " "installing the HTML files, gtkdoc-fixxref can be " @@ -477,22 +485,22 @@ msgstr "" "esa documentación está instalada)." #. (itstool) path: sect1/title -#: C/index.docbook:299 +#: C/index.docbook:305 msgid "Getting GTK-Doc" msgstr "Obtener GTK-Doc" #. (itstool) path: sect2/title -#: C/index.docbook:302 +#: C/index.docbook:308 msgid "Requirements" msgstr "Requerimientos" #. (itstool) path: sect2/para -#: C/index.docbook:303 +#: C/index.docbook:309 msgid "Perl v5 - the main scripts are in Perl." msgstr "Perl v5: los scripts principales están en Perl." #. (itstool) path: sect2/para -#: C/index.docbook:306 +#: C/index.docbook:312 msgid "" "xsltproc - the xslt processor from libxslt xmlsoft.org/XSLT/" @@ -501,7 +509,7 @@ msgstr "" "\"http://xmlsoft.org/XSLT/\" type=\"http\">xmlsoft.org/XSLT/" #. (itstool) path: sect2/para -#: C/index.docbook:310 +#: C/index.docbook:316 msgid "" "docbook-xsl - the docbook xsl stylesheets sourceforge.net/projects/docbook/files/docbook-xsl" #. (itstool) path: sect2/para -#: C/index.docbook:314 +#: C/index.docbook:320 msgid "Python - optional - for gtkdoc-depscan" msgstr "Python: opcional, para gtkdoc-depscan" #. (itstool) path: sect2/para -#: C/index.docbook:317 +#: C/index.docbook:323 msgid "" "One of source-highlight, highlight " "or vim - optional - used for syntax highlighting of " @@ -528,20 +536,17 @@ msgstr "" "los ejemplos." #. (itstool) path: sect1/title -#: C/index.docbook:325 +#: C/index.docbook:331 msgid "About GTK-Doc" msgstr "Acerca de GTK-Doc" #. (itstool) path: sect1/para -#: C/index.docbook:327 C/index.docbook:341 +#: C/index.docbook:333 C/index.docbook:347 msgid "(FIXME)" msgstr "(ARRÉGLAME)" #. (itstool) path: sect1/para -#: C/index.docbook:331 -#| msgid "" -#| "(History, authors, web pages, license, future plans, comparison with " -#| "other similar systems.)" +#: C/index.docbook:337 msgid "" "(History, authors, web pages, mailing list, license, future plans, " "comparison with other similar systems.)" @@ -550,22 +555,22 @@ msgstr "" "futuros, comparación con otros sistemas similares.)" #. (itstool) path: sect1/title -#: C/index.docbook:339 +#: C/index.docbook:345 msgid "About this Manual" msgstr "Acerca de este manual" #. (itstool) path: sect1/para -#: C/index.docbook:345 +#: C/index.docbook:351 msgid "(who it is meant for, where you can get it, license)" msgstr "(a quién está dirigido, dónde puede obtenerse, licencia)" #. (itstool) path: chapter/title -#: C/index.docbook:354 +#: C/index.docbook:360 msgid "Setting up your project" msgstr "Configurando su proyecto" #. (itstool) path: chapter/para -#: C/index.docbook:356 +#: C/index.docbook:362 msgid "" "The next sections describe what steps to perform to integrate GTK-Doc into " "your project. Theses sections assume we work on a project called 'meep'. " @@ -585,12 +590,12 @@ msgstr "" "construcción diferente." #. (itstool) path: sect1/title -#: C/index.docbook:367 +#: C/index.docbook:373 msgid "Setting up a skeleton documentation" msgstr "Configurar el esquema de la documentación" #. (itstool) path: sect1/para -#: C/index.docbook:369 +#: C/index.docbook:375 msgid "" "Under your top-level project directory create folders called docs/reference " "(this way you can also have docs/help for end-user documentation). It is " @@ -603,26 +608,13 @@ msgstr "" "Para paquetes con una sola biblioteca este paso no es necesario." #. (itstool) path: example/title -#: C/index.docbook:378 +#: C/index.docbook:384 msgid "Example directory structure" msgstr "Ejemplo de estructura de carpetas" #. (itstool) path: example/programlisting -#: C/index.docbook:379 +#: C/index.docbook:385 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "meep/\n" -#| " docs/\n" -#| " reference/\n" -#| " libmeep/\n" -#| " meeper/\n" -#| " src/\n" -#| " libmeep/\n" -#| " meeper/\n" -#| "\n" -#| " " msgid "" "\n" "meep/\n" @@ -645,18 +637,18 @@ msgstr "" " meeper/\n" #. (itstool) path: sect1/para -#: C/index.docbook:376 +#: C/index.docbook:382 msgid "This can then look as shown below: <_:example-1/>" msgstr "Esto después aparecerá como se muestra debajo: <_:example-1/>" #. (itstool) path: sect1/title #. (itstool) path: example/title -#: C/index.docbook:394 C/index.docbook:401 +#: C/index.docbook:400 C/index.docbook:407 msgid "Integration with autoconf" msgstr "Integración con autoconf" #. (itstool) path: sect1/para -#: C/index.docbook:396 +#: C/index.docbook:402 msgid "" "Very easy! Just add one line to your configure.ac " "script." @@ -665,15 +657,8 @@ msgstr "" "filename>." #. (itstool) path: example/programlisting -#: C/index.docbook:402 +#: C/index.docbook:408 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "# check for gtk-doc\n" -#| "GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" -#| "\n" -#| " " msgid "" "\n" "# check for gtk-doc\n" @@ -684,24 +669,13 @@ msgstr "" "GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" #. (itstool) path: example/title -#: C/index.docbook:414 +#: C/index.docbook:420 msgid "Keep gtk-doc optional" msgstr "Mantener gtk-doc como opcional" #. (itstool) path: example/programlisting -#: C/index.docbook:415 +#: C/index.docbook:421 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "# check for gtk-doc\n" -#| "m4_ifdef([GTK_DOC_CHECK], [\n" -#| "GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" -#| "],[\n" -#| "AM_CONDITIONAL([ENABLE_GTK_DOC], false)\n" -#| "])\n" -#| "\n" -#| " " msgid "" "\n" "# check for gtk-doc\n" @@ -720,7 +694,7 @@ msgstr "" "])\n" #. (itstool) path: sect1/para -#: C/index.docbook:409 +#: C/index.docbook:415 msgid "" "This will require all developers to have gtk-doc installed. If it is okay " "for your project to have optional api-doc build setup, you can solve this as " @@ -734,7 +708,7 @@ msgstr "" "<_:example-1/>" #. (itstool) path: sect1/para -#: C/index.docbook:426 +#: C/index.docbook:432 msgid "" "The first argument is used to check for the gtkdocversion at configure time. " "The 2nd, optional argument is used by gtkdocize. " @@ -747,19 +721,19 @@ msgstr "" "symbol> también añade diversas opciones de configuración:" #. (itstool) path: listitem/para -#: C/index.docbook:432 +#: C/index.docbook:438 msgid "--with-html-dir=PATH : path to installed docs" msgstr "--with-html-dir=RUTA: ruta a los documentos instalados" #. (itstool) path: listitem/para -#: C/index.docbook:433 +#: C/index.docbook:439 msgid "--enable-gtk-doc : use gtk-doc to build documentation [default=no]" msgstr "" "--enable-gtk-doc: usar gtk-doc para construir la documentación " "[predeterminado=no]" #. (itstool) path: listitem/para -#: C/index.docbook:434 +#: C/index.docbook:440 msgid "" "--enable-gtk-doc-html : build documentation in html format [default=yes]" msgstr "" @@ -767,14 +741,14 @@ msgstr "" "[predeterminado=sí]" #. (itstool) path: listitem/para -#: C/index.docbook:435 +#: C/index.docbook:441 msgid "--enable-gtk-doc-pdf : build documentation in pdf format [default=no]" msgstr "" "--enable-gtk-doc: usar gtk-doc para construir la documentación " "[predeterminado=no]" #. (itstool) path: important/para -#: C/index.docbook:439 +#: C/index.docbook:445 msgid "" "GTK-Doc is disabled by default! Remember to pass the option to the next configure run. " @@ -788,7 +762,7 @@ msgstr "" "desarrolladores)." #. (itstool) path: sect1/para -#: C/index.docbook:447 +#: C/index.docbook:453 msgid "" "Furthermore it is recommended that you have the following line inside you " "configure.ac script. This allows " @@ -801,19 +775,13 @@ msgstr "" "GTK_DOC_CHECK a su proyecto." #. (itstool) path: example/title -#: C/index.docbook:455 +#: C/index.docbook:461 msgid "Preparation for gtkdocize" msgstr "Preparación para gtkdocize" #. (itstool) path: example/programlisting -#: C/index.docbook:456 +#: C/index.docbook:462 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "AC_CONFIG_MACRO_DIR(m4)\n" -#| "\n" -#| " " msgid "" "\n" "AC_CONFIG_MACRO_DIR(m4)\n" @@ -822,7 +790,7 @@ msgstr "" "AC_CONFIG_MACRO_DIR(m4)\n" #. (itstool) path: sect1/para -#: C/index.docbook:461 +#: C/index.docbook:467 msgid "" "After all changes to configure.ac are made, update the " "configure file. This can be done by re-running " @@ -833,12 +801,12 @@ msgstr "" "volviendo a ejecutar autoreconf -i o autogen.sh." #. (itstool) path: sect1/title -#: C/index.docbook:469 +#: C/index.docbook:475 msgid "Integration with automake" msgstr "Integración con automake" #. (itstool) path: sect1/para -#: C/index.docbook:471 +#: C/index.docbook:477 msgid "" "First copy the Makefile.am from the examples sub directory of the Makefile.am. All the settings have a comment above that describes their " @@ -876,12 +844,12 @@ msgstr "" "soportan para listar los parámetros que soportan." #. (itstool) path: sect1/title -#: C/index.docbook:496 +#: C/index.docbook:502 msgid "Integration with autogen" msgstr "Integración con autogen" #. (itstool) path: sect1/para -#: C/index.docbook:498 +#: C/index.docbook:504 msgid "" "Most projects will have an autogen.sh script to setup " "the build infrastructure after a checkout from version control system (such " @@ -897,19 +865,13 @@ msgstr "" "automake o autoconf." #. (itstool) path: example/title -#: C/index.docbook:507 +#: C/index.docbook:513 msgid "Running gtkdocize from autogen.sh" msgstr "Ejecutar gtkdocize desde autogen.sh" #. (itstool) path: example/programlisting -#: C/index.docbook:508 +#: C/index.docbook:514 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "gtkdocize || exit 1\n" -#| "\n" -#| " " msgid "" "\n" "gtkdocize || exit 1\n" @@ -918,7 +880,7 @@ msgstr "" "gtkdocize || exit 1\n" #. (itstool) path: sect1/para -#: C/index.docbook:514 +#: C/index.docbook:520 msgid "" "When running gtkdocize it copies gtk-" "doc.make to your project root (or any directory specified by the " @@ -934,7 +896,7 @@ msgstr "" "gtkdocize." #. (itstool) path: sect1/para -#: C/index.docbook:523 +#: C/index.docbook:529 msgid "" "Historically GTK-Doc was generating template files where developers entered " "the docs. This turned out to be not so good (e.g. the need for having " @@ -968,12 +930,12 @@ msgstr "" #. (itstool) path: sect1/title #. (itstool) path: example/title -#: C/index.docbook:540 C/index.docbook:557 +#: C/index.docbook:546 C/index.docbook:563 msgid "Running the doc build" msgstr "Ejecutar la construcción de la documentación" #. (itstool) path: sect1/para -#: C/index.docbook:542 +#: C/index.docbook:548 msgid "" "After the previous steps it's time to run the build. First we need to rerun " "autogen.sh. If this script runs configure for you, then " @@ -987,7 +949,7 @@ msgstr "" "configure con esta opción." #. (itstool) path: sect1/para -#: C/index.docbook:549 +#: C/index.docbook:555 msgid "" "The first make run generates several additional files in the doc-" "directories. The important ones are: <package>.types<paquete>-sections.txt." #. (itstool) path: example/programlisting -#: C/index.docbook:558 +#: C/index.docbook:564 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "./autogen.sh --enable-gtk-doc\n" -#| "make\n" -#| "\n" -#| " " msgid "" "\n" "./autogen.sh --enable-gtk-doc\n" @@ -1019,7 +974,7 @@ msgstr "" "make\n" #. (itstool) path: sect1/para -#: C/index.docbook:564 +#: C/index.docbook:570 msgid "" "Now you can point your browser to docs/reference/<package>/" "index.html. Yes, it's a bit disappointing still. But hang-on, " @@ -1031,32 +986,43 @@ msgstr "" "información." #. (itstool) path: sect1/title -#: C/index.docbook:572 +#: C/index.docbook:578 msgid "Integration with version control systems" msgstr "Integración con los sistemas de control de versiones" #. (itstool) path: sect1/para -#: C/index.docbook:574 +#: C/index.docbook:580 msgid "" -"As a rule of the thumb, it's those files you edit, that should go under " -"version control. For typical projects it's these files: <" -"package>.types, <package>-docs.xml " -"(in the past .sgml), <package>-sections.txt, " -"Makefile.am" +"As a rule of thumb, it's the files you edit which should go under version " +"control. For typical projects it's these files: <package>." +"types, <package>-docs.xml (in the " +"past .sgml), <package>-sections.txt, " +"Makefile.am." msgstr "" "Como regla principal, son los archivos que edita los que deberían estar bajo " "el control de versiones. Para proyectos típicos son los archivos: " "<paquete>.types, <paquete>-docs." -"xml (.sgml en el pasado), <paquete>-sections.txt y Makefile.am." +"xml (anteriormente .sgml), <paquete>-sections." +"txt, Makefile.am." + +#. (itstool) path: sect1/para +#: C/index.docbook:588 +msgid "" +"Files in the xml/ and html/ " +"directories should not go under version control. Neither should any of the " +".stamp files." +msgstr "" +"Los archivos de las carpetas xml/ y html/ No deberían estar bajo control de versiones. Tampoco ninguno de " +"los archivos .stamp." #. (itstool) path: sect1/title -#: C/index.docbook:585 +#: C/index.docbook:596 msgid "Integration with plain makefiles or other build systems" msgstr "Integración con makefiles u otros sistemas de construcción" #. (itstool) path: sect1/para -#: C/index.docbook:587 +#: C/index.docbook:598 msgid "" "In the case one does not want to use automake and therefore gtk-" "doc.mak one will need to call the gtkdoc tools in the right order " @@ -1067,34 +1033,20 @@ msgstr "" "makefiles propios (o en otras herramientas de construcción)." #. (itstool) path: example/title -#: C/index.docbook:594 +#: C/index.docbook:605 msgid "Documentation build steps" msgstr "Pasos de construcción de la documentación" #. (itstool) path: example/programlisting -#: C/index.docbook:595 +#: C/index.docbook:606 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "DOC_MODULE=meep\n" -#| "// sources have changed\n" -#| "gtkdoc-scan --module=$(DOC_MODULE) --source-dir=...\n" -#| "gtkdoc-scangobj --module=$(DOC_MODULE)\n" -#| "gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml\n" -#| "// xml files have changed\n" -#| "mkdir html\n" -#| "cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml\n" -#| "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html\n" -#| "\n" -#| " " msgid "" "\n" "DOC_MODULE=meep\n" "// sources have changed\n" -"gtkdoc-scan --module=$(DOC_MODULE) --source-dir=...\n" +"gtkdoc-scan --module=$(DOC_MODULE) <source-dir>\n" "gtkdoc-scangobj --module=$(DOC_MODULE)\n" -"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml\n" +"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir=<source-dir>\n" "// xml files have changed\n" "mkdir html\n" "cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml\n" @@ -1103,16 +1055,16 @@ msgstr "" "\n" "DOC_MODULE=meep\n" "// sources have changed\n" -"gtkdoc-scan --module=$(DOC_MODULE) --source-dir=...\n" +"gtkdoc-scan --module=$(DOC_MODULE) <source-dir>\n" "gtkdoc-scangobj --module=$(DOC_MODULE)\n" -"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml\n" +"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir=<source-dir>\n" "// xml files have changed\n" "mkdir html\n" "cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml\n" "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html\n" #. (itstool) path: sect1/para -#: C/index.docbook:609 +#: C/index.docbook:620 msgid "" "One will need to look at the Makefile.am and " "gtk-doc.mak to pick the extra options needed." @@ -1121,12 +1073,12 @@ msgstr "" "doc.mak para elegir las opciones adicionales necesarias." #. (itstool) path: chapter/title -#: C/index.docbook:618 +#: C/index.docbook:629 msgid "Documenting the code" msgstr "Documentar el código" #. (itstool) path: chapter/para -#: C/index.docbook:620 +#: C/index.docbook:631 msgid "" "GTK-Doc uses source code comment with a special syntax for code " "documentation. Further it retrieves information about your project structure " @@ -1139,12 +1091,12 @@ msgstr "" "acerca de la sintaxis de los comentarios." #. (itstool) path: note/title -#: C/index.docbook:628 +#: C/index.docbook:639 msgid "Documentation placement" msgstr "Ubicación de la documentación" #. (itstool) path: note/para -#: C/index.docbook:629 +#: C/index.docbook:640 msgid "" "In the past most documentation had to be filled into files residing inside " "the tmpl directory. This has the disadvantages that the " @@ -1158,7 +1110,7 @@ msgstr "" "conflictos con los sistemas de control de versiones." #. (itstool) path: note/para -#: C/index.docbook:635 +#: C/index.docbook:646 msgid "" "The avoid the aforementioned problems we suggest putting the documentation " "inside the sources. This manual will only describe this way of documenting " @@ -1169,21 +1121,13 @@ msgstr "" "documentar el código." #. (itstool) path: example/title -#: C/index.docbook:646 C/index.docbook:663 +#: C/index.docbook:657 C/index.docbook:674 msgid "GTK-Doc comment block" msgstr "Bloque de comentario de GTK-Doc" #. (itstool) path: example/programlisting -#: C/index.docbook:647 +#: C/index.docbook:658 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "#ifndef __GTK_DOC_IGNORE__\n" -#| "/* unparseable code here */\n" -#| "#endif\n" -#| "\n" -#| " " msgid "" "\n" "#ifndef __GTK_DOC_IGNORE__\n" @@ -1196,7 +1140,7 @@ msgstr "" "#endif\n" #. (itstool) path: chapter/para -#: C/index.docbook:642 +#: C/index.docbook:653 msgid "" "The scanner can handle the majority of C headers fine. In the case of " "receiving warnings from the scanner that look like a special case, one can " @@ -1207,22 +1151,13 @@ msgstr "" "GTK-Doc que los omita. <_:example-1/>" #. (itstool) path: sect1/title -#: C/index.docbook:658 +#: C/index.docbook:669 msgid "Documentation comments" msgstr "Comentarios de la documentación" #. (itstool) path: example/programlisting -#: C/index.docbook:664 +#: C/index.docbook:675 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * identifier:\n" -#| " * documentation ...\n" -#| " */\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -1237,7 +1172,7 @@ msgstr "" " */\n" #. (itstool) path: sect1/para -#: C/index.docbook:660 +#: C/index.docbook:671 msgid "" "A multiline comment that starts with an additional '*' marks a documentation " "block that will be processed by the GTK-Doc tools. <_:example-1/>" @@ -1246,7 +1181,7 @@ msgstr "" "bloque de documentación que GTK-Doc tools procesarán. <_:example-1/>" #. (itstool) path: sect1/para -#: C/index.docbook:673 +#: C/index.docbook:684 msgid "" "The 'identifier' is one line with the name of the item the comment is " "related to. The syntax differs a little depending on the item. (TODO add " @@ -1257,7 +1192,7 @@ msgstr "" "hacer: añadir una tabla mostrando los identificadores)" #. (itstool) path: sect1/para -#: C/index.docbook:679 +#: C/index.docbook:690 msgid "" "The 'documentation' block is also different for each symbol type. Symbol " "types that get parameters such as functions or macros have the parameter " @@ -1277,7 +1212,7 @@ msgstr "" "espacio). Esto es útil para texto preformateado (listados de código)." #. (itstool) path: listitem/para -#: C/index.docbook:696 +#: C/index.docbook:707 msgid "" "What it is: The name for a class or function can sometimes be misleading for " "people coming from a different background." @@ -1286,24 +1221,24 @@ msgstr "" "personas que provengan de otros entornos." #. (itstool) path: listitem/para -#: C/index.docbook:702 +#: C/index.docbook:713 msgid "" "What it does: Tell about common uses. Put it in relation with the other API." msgstr "Qué hace: indique los usos comunes, en relación con las otras API." #. (itstool) path: tip/para -#: C/index.docbook:692 +#: C/index.docbook:703 msgid "When documenting code, describe two aspects: <_:itemizedlist-1/>" msgstr "Al documentar código, describa dos aspectos: <_:itemizedlist-1/>" #. (itstool) path: listitem/para -#: C/index.docbook:717 +#: C/index.docbook:728 msgid "Use function() to refer to functions or macros which take arguments." msgstr "" "Use función() para referirse a funciones o macros que toman argumentos." #. (itstool) path: listitem/para -#: C/index.docbook:722 +#: C/index.docbook:733 msgid "" "Use @param to refer to parameters. Also use this when referring to " "parameters of other functions, related to the one being described." @@ -1312,12 +1247,12 @@ msgstr "" "parámetros de otras funciones, relacionados al que se describe." #. (itstool) path: listitem/para -#: C/index.docbook:728 +#: C/index.docbook:739 msgid "Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS." msgstr "Use %constant para referirse a una constante, ej: %G_TRAVERSE_LEAFS." #. (itstool) path: listitem/para -#: C/index.docbook:733 +#: C/index.docbook:744 msgid "" "Use #symbol to refer to other types of symbol, e.g. structs and enums and " "macros which don't take arguments." @@ -1326,17 +1261,17 @@ msgstr "" "estructuras, enumeraciones y macros que no toman argumentos." #. (itstool) path: listitem/para -#: C/index.docbook:739 +#: C/index.docbook:750 msgid "Use #Object::signal to refer to a GObject signal." msgstr "Use #Object::signal para referirse a una señal de GObject." #. (itstool) path: listitem/para -#: C/index.docbook:744 +#: C/index.docbook:755 msgid "Use #Object:property to refer to a GObject property." msgstr "Use #Object:property para referirse a una propiedad de GObject." #. (itstool) path: listitem/para -#: C/index.docbook:749 +#: C/index.docbook:760 msgid "" "Use #Struct.field to refer to a field inside a structure and #GObjectClass." "foo_bar() to refer to a vmethod." @@ -1345,7 +1280,7 @@ msgstr "" "#GObjectClass.foo_bar() para referirse a un vmethod." #. (itstool) path: sect1/para -#: C/index.docbook:711 +#: C/index.docbook:722 msgid "" "One advantage of hyper-text over plain-text is the ability to have links in " "the document. Writing the correct markup for a link can be tedious though. " @@ -1358,7 +1293,7 @@ msgstr "" "itemizedlist-1/>" #. (itstool) path: tip/para -#: C/index.docbook:758 +#: C/index.docbook:769 msgid "" "If you need to use the special characters '<', '>', '()', '@', '%', or " "'#' in your documentation without GTK-Doc changing them you can use the XML " @@ -1373,7 +1308,7 @@ msgstr "" "doble «\\»." #. (itstool) path: sect1/para -#: C/index.docbook:767 +#: C/index.docbook:778 msgid "" "DocBook can do more than just links. One can also have lists, examples, " "headings, and images. As of version 1.20, the preferred way is to use a " @@ -1391,7 +1326,7 @@ msgstr "" "elementos de una lista aparecerán como líneas que empiezan con un guión." #. (itstool) path: sect1/para -#: C/index.docbook:778 +#: C/index.docbook:789 msgid "" "In older GTK-Doc releases, if you need support for additional formatting, " "you would need to enable the usage of docbook SGML/XML tags inside doc-" @@ -1406,52 +1341,13 @@ msgstr "" "dentro de Makefile.am." #. (itstool) path: example/title -#: C/index.docbook:788 +#: C/index.docbook:799 msgid "GTK-Doc comment block using Markdown" msgstr "Bloque de comentario de GTK-Doc usando marcado" #. (itstool) path: example/programlisting -#: C/index.docbook:789 +#: C/index.docbook:800 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * identifier:\n" -#| " *\n" -#| " * documentation paragraph ...\n" -#| " *\n" -#| " * # Sub Heading #\n" -#| " *\n" -#| " * ## Second Sub Heading\n" -#| " *\n" -#| " * # Sub Heading With a Link Anchor # {#heading-two}\n" -#| " *\n" -#| " * more documentation:\n" -#| " *\n" -#| " * - list item 1\n" -#| " *\n" -#| " * Paragraph inside a list item.\n" -#| " *\n" -#| " * - list item 2\n" -#| " *\n" -#| " * 1. numbered list item\n" -#| " *\n" -#| " * 2. another numbered list item\n" -#| " *\n" -#| " * Another paragraph. [A Link to the GNOME Website](http://www.gnome.org/)\n" -#| " *\n" -#| " * ![an inline image][plot-result.png]\n" -#| " *\n" -#| " * [A link to the heading anchor above][heading-two]\n" -#| " *\n" -#| " * A C-language example:\n" -#| " * |[<!-- language=\"C\" -->\n" -#| " * GtkWidget *label = gtk_label_new (\"Gorgeous!\");\n" -#| " * ]|\n" -#| " */\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -1526,7 +1422,7 @@ msgstr "" " */\n" #. (itstool) path: sect1/para -#: C/index.docbook:828 +#: C/index.docbook:839 msgid "" "More examples of what markdown tags are supported can be found in the ." #. (itstool) path: tip/para -#: C/index.docbook:834 +#: C/index.docbook:845 msgid "" "As already mentioned earlier GTK-Doc is for documenting public API. Thus one " "cannot write documentation for static symbols. Nevertheless it is good to " @@ -1559,12 +1455,12 @@ msgstr "" "secciones." #. (itstool) path: sect1/title -#: C/index.docbook:848 +#: C/index.docbook:859 msgid "Documenting sections" msgstr "Documentar secciones" #. (itstool) path: sect1/para -#: C/index.docbook:850 +#: C/index.docbook:861 msgid "" "Each section of the documentation contains information about one class or " "module. To introduce the component one can write a section block. The short " @@ -1577,30 +1473,13 @@ msgstr "" "los campos @ son opcionales." #. (itstool) path: example/title -#: C/index.docbook:858 +#: C/index.docbook:869 msgid "Section comment block" msgstr "Bloque de comentarios en una sección" #. (itstool) path: example/programlisting -#: C/index.docbook:859 +#: C/index.docbook:870 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * SECTION:meepapp\n" -#| " * @short_description: the application class\n" -#| " * @title: Meep application\n" -#| " * @section_id:\n" -#| " * @see_also: #MeepSettings\n" -#| " * @stability: Stable\n" -#| " * @include: meep/app.h\n" -#| " * @image: application.png\n" -#| " *\n" -#| " * The application class handles ...\n" -#| " */\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -1631,12 +1510,12 @@ msgstr "" " */\n" #. (itstool) path: varlistentry/term -#: C/index.docbook:878 +#: C/index.docbook:889 msgid "SECTION:<name>" msgstr "SECCIÓN <nombre>" #. (itstool) path: listitem/para -#: C/index.docbook:880 +#: C/index.docbook:891 msgid "" "The name links the section documentation to the respective part in the " "<package>-sections.txt file. The name give here " @@ -1649,12 +1528,12 @@ msgstr "" "archivo <paquete>-sections.txt." #. (itstool) path: varlistentry/term -#: C/index.docbook:889 +#: C/index.docbook:900 msgid "@short_description" msgstr "@short_description" #. (itstool) path: listitem/para -#: C/index.docbook:891 +#: C/index.docbook:902 msgid "" "A one line description of the section, that later will appear after the " "links in the TOC and at the top of the section page." @@ -1663,12 +1542,12 @@ msgstr "" "TOC y en la página de la sección." #. (itstool) path: varlistentry/term -#: C/index.docbook:898 +#: C/index.docbook:909 msgid "@title" msgstr "@title" #. (itstool) path: listitem/para -#: C/index.docbook:900 +#: C/index.docbook:911 msgid "" "The section title defaults to <name> from the SECTION declaration. It " "can be overridden with the @title field." @@ -1677,12 +1556,12 @@ msgstr "" "declaración SECTION. Se puede sobrescribir con el campo @title." #. (itstool) path: varlistentry/term -#: C/index.docbook:907 +#: C/index.docbook:918 msgid "@section_id" msgstr "@section_id" #. (itstool) path: listitem/para -#: C/index.docbook:909 +#: C/index.docbook:920 msgid "" "Overrides the use of title as a section identifier. For GObjects the <" "title> is used as a section_id and for other sections it is <" @@ -1693,22 +1572,22 @@ msgstr "" "para otra sección es <MÓDULO>-<title>." #. (itstool) path: varlistentry/term -#: C/index.docbook:917 +#: C/index.docbook:928 msgid "@see_also" msgstr "@see_also" #. (itstool) path: listitem/para -#: C/index.docbook:919 +#: C/index.docbook:930 msgid "A list of symbols that are related to this section." msgstr "Una lista de símbolos relacionados con esta sección." #. (itstool) path: varlistentry/term -#: C/index.docbook:925 +#: C/index.docbook:936 msgid "@stability" msgstr "@stability" #. (itstool) path: listitem/para -#: C/index.docbook:932 +#: C/index.docbook:943 msgid "" "Stable - The intention of a Stable interface is to enable arbitrary third " "parties to develop applications to these interfaces, release them, and have " @@ -1726,7 +1605,7 @@ msgstr "" "de haberlos habrá buenas razones para ello." #. (itstool) path: listitem/para -#: C/index.docbook:944 +#: C/index.docbook:955 msgid "" "Unstable - Unstable interfaces are experimental or transitional. They are " "typically used to give outside developers early access to new or rapidly " @@ -1742,7 +1621,7 @@ msgstr "" "publicación menor a la siguiente." #. (itstool) path: listitem/para -#: C/index.docbook:956 +#: C/index.docbook:967 msgid "" "Private - An interface that can be used within the GNOME stack itself, but " "that is not documented for end-users. Such functions should only be used in " @@ -1753,7 +1632,7 @@ msgstr "" "deberían usar de formas especificadas y documentadas." #. (itstool) path: listitem/para -#: C/index.docbook:965 +#: C/index.docbook:976 msgid "" "Internal - An interface that is internal to a module and does not require " "end-user documentation. Functions that are undocumented are assumed to be " @@ -1764,7 +1643,7 @@ msgstr "" "son internas." #. (itstool) path: listitem/para -#: C/index.docbook:927 +#: C/index.docbook:938 msgid "" "An informal description of the stability level this API has. We recommend " "the use of one of these terms: <_:itemizedlist-1/>" @@ -1773,12 +1652,12 @@ msgstr "" "recomienda el uso de uno de estos términos: <_:itemizedlist-1/>" #. (itstool) path: varlistentry/term -#: C/index.docbook:977 +#: C/index.docbook:988 msgid "@include" msgstr "@include" #. (itstool) path: listitem/para -#: C/index.docbook:979 +#: C/index.docbook:990 msgid "" "The #include files to show in the section synopsis (a " "comma separated list), overriding the global value from the the wiki." +msgstr "" +"Los bloques de documentación pueden contener etiquetas de anotaciones. Estas " +"etiquetas se renderizarán con consejos que describan su significado. Las " +"etiquetas se usan en la introspección de GObject para generar vinculaciones " +"del lenguaje. Puede obtener una lista detallada de las etiquetas soportadas " +"en el wiki." + +#. (itstool) path: example/programlisting +#: C/index.docbook:1092 +#, no-wrap +msgid "" +"\n" +"/**\n" +" * foo_get_bar: (annotation)\n" +" * @foo: (annotation): some foo\n" +" *\n" +" * Retrieves @foo's bar.\n" +" *\n" +" * Returns: (annotation): @foo's bar\n" +" */\n" +"...\n" +"/**\n" +" * foo_set_bar_using_the_frobnicator: (annotation) (another annotation)\n" +" * (and another annotation)\n" +" * @foo: (annotation) (another annotation): some foo\n" +" *\n" +" * Sets bar on @foo.\n" +" */\n" +msgstr "" +"\n" +"/**\n" +" * foo_get_bar: (annotation)\n" +" * @foo: (annotation): some foo\n" +" *\n" +" * Retrieves @foo's bar.\n" +" *\n" +" * Returns: (annotation): @foo's bar\n" +" */\n" +"...\n" +"/**\n" +" * foo_set_bar_using_the_frobnicator: (annotation) (another annotation)\n" +" * (and another annotation)\n" +" * @foo: (annotation) (another annotation): some foo\n" +" *\n" +" * Sets bar on @foo.\n" +" */\n" + +#. (itstool) path: sect2/title +#. (itstool) path: example/title +#: C/index.docbook:1113 C/index.docbook:1142 msgid "Function comment block" msgstr "Bloque de comentario de función" #. (itstool) path: listitem/para -#: C/index.docbook:1076 +#: C/index.docbook:1119 msgid "" "Document whether returned objects, lists, strings, etc, should be freed/" "unrefed/released." @@ -1962,26 +1884,26 @@ msgstr "" "debería liberarse/desreferenciarse/etc." #. (itstool) path: listitem/para -#: C/index.docbook:1082 +#: C/index.docbook:1125 msgid "Document whether parameters can be NULL, and what happens if they are." msgstr "" "El documento, dependiendo de si sus parámetros pueden ser nulos, y qué " "sucede si lo son." #. (itstool) path: listitem/para -#: C/index.docbook:1087 +#: C/index.docbook:1130 msgid "" "Mention interesting pre-conditions and post-conditions where appropriate." msgstr "" "Mencionar precondiciones y postcondiciones interesantes donde sea apropiado." #. (itstool) path: sect2/para -#: C/index.docbook:1072 C/index.docbook:1165 +#: C/index.docbook:1115 C/index.docbook:1201 msgid "Please remember to: <_:itemizedlist-1/>" msgstr "Recuerde: <_:itemizedlist-1/>" #. (itstool) path: sect2/para -#: C/index.docbook:1094 +#: C/index.docbook:1137 msgid "" "Gtk-doc assumes all symbols (macros, functions) starting with '_' are " "private. They are treated like static functions." @@ -1989,40 +1911,9 @@ msgstr "" "GTK-Doc asume que todos los símbolos (macros, funciones) que empiezan por " "«_» son privados. Se tratan como funciones estáticas." -#. (itstool) path: sect2/para -#: C/index.docbook:1099 -msgid "" -"Also, take a look at GObject Introspection annotation tags: http://live." -"gnome.org/GObjectIntrospection/Annotations" -msgstr "" -"Consulte también las anotaciones de las etiquetas de introspección de " -"GObject: http://live.gnome.org/GObjectIntrospection/Annotations" - #. (itstool) path: example/programlisting -#: C/index.docbook:1107 +#: C/index.docbook:1143 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * function_name:\n" -#| " * @par1: description of parameter 1. These can extend over more than\n" -#| " * one line.\n" -#| " * @par2: description of parameter 2\n" -#| " * @...: a %NULL-terminated list of bars\n" -#| " *\n" -#| " * The function description goes here. You can use @par1 to refer to parameters\n" -#| " * so that they are highlighted in the output. You can also use %constant\n" -#| " * for constants, function_name2() for functions and #GtkWidget for links to\n" -#| " * other declarations (which may be documented elsewhere).\n" -#| " *\n" -#| " * Returns: an integer.\n" -#| " *\n" -#| " * Since: 2.2\n" -#| " * Deprecated: 2.18: Use other_function() instead.\n" -#| " */\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -2063,27 +1954,27 @@ msgstr "" " */\n" #. (itstool) path: variablelist/title -#: C/index.docbook:1128 +#: C/index.docbook:1164 msgid "Function tags" msgstr "Etiquetas de funciones" #. (itstool) path: varlistentry/term -#: C/index.docbook:1129 +#: C/index.docbook:1165 msgid "Returns:" msgstr "Devuelve:" #. (itstool) path: listitem/para -#: C/index.docbook:1131 +#: C/index.docbook:1167 msgid "Paragraph describing the returned result." msgstr "Párrafo que describe el resultado devuelto." #. (itstool) path: varlistentry/term -#: C/index.docbook:1136 +#: C/index.docbook:1172 msgid "@...:" msgstr "@...:" #. (itstool) path: listitem/para -#: C/index.docbook:1138 +#: C/index.docbook:1174 msgid "" "In case the function has variadic arguments, you should use this tag " "(@Varargs: does also work for historic reasons)." @@ -2093,24 +1984,13 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1148 C/index.docbook:1150 +#: C/index.docbook:1184 C/index.docbook:1186 msgid "Property comment block" msgstr "Bloque de comentario de propiedad" #. (itstool) path: example/programlisting -#: C/index.docbook:1151 +#: C/index.docbook:1187 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * SomeWidget:some-property:\n" -#| " *\n" -#| " * Here you can document a property.\n" -#| " */\n" -#| "g_object_class_install_property (object_class, PROP_SOME_PROPERTY, ...);\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -2130,12 +2010,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1163 C/index.docbook:1182 +#: C/index.docbook:1199 C/index.docbook:1218 msgid "Signal comment block" msgstr "Bloque de comentario de señal" #. (itstool) path: listitem/para -#: C/index.docbook:1169 +#: C/index.docbook:1205 msgid "" "Document when the signal is emitted and whether it is emitted before or " "after other signals." @@ -2144,29 +2024,13 @@ msgstr "" "otras señales." #. (itstool) path: listitem/para -#: C/index.docbook:1175 +#: C/index.docbook:1211 msgid "Document what an application might do in the signal handler." msgstr "Documentar qué aplicación debe gestionar las señales." #. (itstool) path: example/programlisting -#: C/index.docbook:1183 +#: C/index.docbook:1219 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * FooWidget::foobarized:\n" -#| " * @widget: the widget that received the signal\n" -#| " * @foo: some foo\n" -#| " * @bar: some bar\n" -#| " *\n" -#| " * The ::foobarized signal is emitted each time someone tries to foobarize @widget.\n" -#| " */\n" -#| "foo_signals[FOOBARIZE] =\n" -#| " g_signal_new (\"foobarize\",\n" -#| " ...\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -2196,31 +2060,13 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1200 C/index.docbook:1201 +#: C/index.docbook:1236 C/index.docbook:1237 msgid "Struct comment block" msgstr "Bloque de comentario de estructura" #. (itstool) path: example/programlisting -#: C/index.docbook:1202 +#: C/index.docbook:1238 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * FooWidget:\n" -#| " * @bar: some #gboolean\n" -#| " *\n" -#| " * This is the best widget, ever.\n" -#| " */\n" -#| "typedef struct _FooWidget {\n" -#| " /*< private >*/\n" -#| " GtkWidget parent;\n" -#| "\n" -#| " /*< public >*/\n" -#| " gboolean bar;\n" -#| "} FooWidget;\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -2253,7 +2099,7 @@ msgstr "" "} FooWidget;\n" #. (itstool) path: sect2/para -#: C/index.docbook:1219 +#: C/index.docbook:1255 msgid "" "Use /*< private >*/ before the private struct fields you " "want to hide. Use /*< public >*/ for the reverse " @@ -2264,7 +2110,7 @@ msgstr "" "revertir el comportamiento anterior." #. (itstool) path: sect2/para -#: C/index.docbook:1225 +#: C/index.docbook:1261 msgid "" "Struct comment blocks can also be used for GObjects and GObjectClasses. It " "is usually a good idea to add a comment block for a class, if it has " @@ -2284,31 +2130,13 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1237 C/index.docbook:1238 +#: C/index.docbook:1273 C/index.docbook:1274 msgid "Enum comment block" msgstr "Enumerar bloques de comentarios" #. (itstool) path: example/programlisting -#: C/index.docbook:1239 +#: C/index.docbook:1275 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "/**\n" -#| " * Something:\n" -#| " * @SOMETHING_FOO: something foo\n" -#| " * @SOMETHING_BAR: something bar\n" -#| " *\n" -#| " * Enum values used for the thing, to specify the thing.\n" -#| " */\n" -#| "typedef enum {\n" -#| " SOMETHING_FOO,\n" -#| " SOMETHING_BAR,\n" -#| " /*< private >*/\n" -#| " SOMETHING_COUNT\n" -#| "} Something;\n" -#| "\n" -#| " " msgid "" "\n" "/**\n" @@ -2341,7 +2169,7 @@ msgstr "" "} Something;\n" #. (itstool) path: sect2/para -#: C/index.docbook:1256 +#: C/index.docbook:1292 msgid "" "Use /*< private >*/ before the private enum values you " "want to hide. Use /*< public >*/ for the reverse " @@ -2352,26 +2180,20 @@ msgstr "" "comportamiento anterior." #. (itstool) path: sect1/title -#: C/index.docbook:1266 +#: C/index.docbook:1302 msgid "Useful DocBook tags" msgstr "Etiquetas DocBook útiles" #. (itstool) path: sect1/para -#: C/index.docbook:1268 +#: C/index.docbook:1304 msgid "" "Here are some DocBook tags which are most useful when documenting the code." msgstr "" "Aquí están varias etiquetas de DocBook muy útiles al documentar código." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1277 +#: C/index.docbook:1313 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<link linkend=\"glib-Hash-Tables\">Hash Tables</link>\n" -#| "\n" -#| " " msgid "" "\n" "<link linkend=\"glib-Hash-Tables\">Hash Tables</link>\n" @@ -2380,7 +2202,7 @@ msgstr "" "<link linkend=\"glib-Hash-Tables\">Hash Tables</link>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1273 +#: C/index.docbook:1309 msgid "" "To link to another section in the GTK docs: <_:informalexample-1/> The " "linkend is the SGML/XML id on the top item of the page you want to link to. " @@ -2396,14 +2218,8 @@ msgstr "" "ajustarse a SGML/XML." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1290 +#: C/index.docbook:1326 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<function>...</function>\n" -#| "\n" -#| " " msgid "" "\n" "<function>...</function>\n" @@ -2412,7 +2228,7 @@ msgstr "" "<function>...</function>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1287 +#: C/index.docbook:1323 msgid "" "To refer to an external function, e.g. a standard C function: <_:" "informalexample-1/>" @@ -2421,19 +2237,8 @@ msgstr "" "informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1299 +#: C/index.docbook:1335 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<example>\n" -#| " <title>Using a GHashTable.</title>\n" -#| " <programlisting>\n" -#| " ...\n" -#| " </programlisting>\n" -#| "</example>\n" -#| "\n" -#| " " msgid "" "\n" "<example>\n" @@ -2452,18 +2257,8 @@ msgstr "" "</example>\n" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1310 +#: C/index.docbook:1346 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<informalexample>\n" -#| " <programlisting>\n" -#| " ...\n" -#| " </programlisting>\n" -#| "</informalexample>\n" -#| "\n" -#| " " msgid "" "\n" "<informalexample>\n" @@ -2480,7 +2275,7 @@ msgstr "" "</informalexample>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1296 +#: C/index.docbook:1332 msgid "" "To include example code: <_:informalexample-1/> or possibly this, for very " "short code fragments which don't need a title: <_:informalexample-2/> For " @@ -2491,25 +2286,8 @@ msgstr "" "informalexample-2/>. El último GTK-Doc también soporta abreviación: |[ ... ]|" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1329 +#: C/index.docbook:1365 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<itemizedlist>\n" -#| " <listitem>\n" -#| " <para>\n" -#| " ...\n" -#| " </para>\n" -#| " </listitem>\n" -#| " <listitem>\n" -#| " <para>\n" -#| " ...\n" -#| " </para>\n" -#| " </listitem>\n" -#| "</itemizedlist>\n" -#| "\n" -#| " " msgid "" "\n" "<itemizedlist>\n" @@ -2540,23 +2318,13 @@ msgstr "" "</itemizedlist>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1326 +#: C/index.docbook:1362 msgid "To include bulleted lists: <_:informalexample-1/>" msgstr "Para incluir listas de topos: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1349 +#: C/index.docbook:1385 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<note>\n" -#| " <para>\n" -#| " Make sure you free the data after use.\n" -#| " </para>\n" -#| "</note>\n" -#| "\n" -#| " " msgid "" "\n" "<note>\n" @@ -2573,20 +2341,14 @@ msgstr "" "</note>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1346 +#: C/index.docbook:1382 msgid "" "To include a note which stands out from the text: <_:informalexample-1/>" msgstr "Para incluir una nota que sobresale del texto: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1362 +#: C/index.docbook:1398 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<type>unsigned char</type>\n" -#| "\n" -#| " " msgid "" "\n" "<type>unsigned char</type>\n" @@ -2595,19 +2357,13 @@ msgstr "" "<type>unsigned char</type>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1359 +#: C/index.docbook:1395 msgid "To refer to a type: <_:informalexample-1/>" msgstr "Para referirse a un tipo: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1371 +#: C/index.docbook:1407 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<structname>XFontStruct</structname>\n" -#| "\n" -#| " " msgid "" "\n" "<structname>XFontStruct</structname>\n" @@ -2616,7 +2372,7 @@ msgstr "" "<structname>XFontStruct</structname>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1368 +#: C/index.docbook:1404 msgid "" "To refer to an external structure (not one described in the GTK docs): <_:" "informalexample-1/>" @@ -2625,14 +2381,8 @@ msgstr "" "de GTK): <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1380 +#: C/index.docbook:1416 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<structfield>len</structfield>\n" -#| "\n" -#| " " msgid "" "\n" "<structfield>len</structfield>\n" @@ -2641,19 +2391,13 @@ msgstr "" "<structfield>len</structfield>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1377 +#: C/index.docbook:1413 msgid "To refer to a field of a structure: <_:informalexample-1/>" msgstr "Para referirse a un campo o a una estructura: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1389 +#: C/index.docbook:1425 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<classname>GtkWidget</classname>\n" -#| "\n" -#| " " msgid "" "\n" "<classname>GtkWidget</classname>\n" @@ -2662,7 +2406,7 @@ msgstr "" "<classname>GtkWidget</classname>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1386 +#: C/index.docbook:1422 msgid "" "To refer to a class name, we could possibly use: <_:informalexample-1/> but " "you'll probably be using #GtkWidget instead (to automatically create a link " @@ -2675,14 +2419,8 @@ msgstr "" "\"documenting_syntax\">abreviaciones)." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1400 +#: C/index.docbook:1436 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<emphasis>This is important</emphasis>\n" -#| "\n" -#| " " msgid "" "\n" "<emphasis>This is important</emphasis>\n" @@ -2691,19 +2429,13 @@ msgstr "" "<emphasis>This is important</emphasis>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1397 +#: C/index.docbook:1433 msgid "To emphasize text: <_:informalexample-1/>" msgstr "Para enfatizar un texto: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1409 +#: C/index.docbook:1445 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<filename>/home/user/documents</filename>\n" -#| "\n" -#| " " msgid "" "\n" "<filename>/home/user/documents</filename>\n" @@ -2712,19 +2444,13 @@ msgstr "" "<filename>/home/user/documents</filename>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1406 +#: C/index.docbook:1442 msgid "For filenames use: <_:informalexample-1/>" msgstr "Para uso de nombres de archivo: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1418 +#: C/index.docbook:1454 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>\n" -#| "\n" -#| " " msgid "" "\n" "<keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>\n" @@ -2733,17 +2459,17 @@ msgstr "" "<keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1415 +#: C/index.docbook:1451 msgid "To refer to keys use: <_:informalexample-1/>" msgstr "Para referirse a claves: <_:informalexample-1/>" #. (itstool) path: chapter/title -#: C/index.docbook:1428 +#: C/index.docbook:1464 msgid "Filling the extra files" msgstr "Rellenar campos adicionales" #. (itstool) path: chapter/para -#: C/index.docbook:1430 +#: C/index.docbook:1466 msgid "" "There are a couple of extra files, that need to be maintained along with the " "inline source code comments: <package>.types, " @@ -2756,12 +2482,12 @@ msgstr "" "pasado) y <paquete>-sections.txt." #. (itstool) path: sect1/title -#: C/index.docbook:1439 +#: C/index.docbook:1475 msgid "Editing the types file" msgstr "Editar los tipos de archivo" #. (itstool) path: sect1/para -#: C/index.docbook:1441 +#: C/index.docbook:1477 msgid "" "If your library or application includes GObjects, you want their signals, " "arguments/parameters and position in the hierarchy to be shown in the " @@ -2776,24 +2502,13 @@ msgstr "" "<paquete>.types." #. (itstool) path: example/title -#: C/index.docbook:1450 +#: C/index.docbook:1486 msgid "Example types file snippet" msgstr "Fragmento de ejemplo de tipos de archivo" #. (itstool) path: example/programlisting -#: C/index.docbook:1451 +#: C/index.docbook:1487 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "#include <gtk/gtk.h>\n" -#| "\n" -#| "gtk_accel_label_get_type\n" -#| "gtk_adjustment_get_type\n" -#| "gtk_alignment_get_type\n" -#| "gtk_arrow_get_type\n" -#| "\n" -#| " " msgid "" "\n" "#include <gtk/gtk.h>\n" @@ -2812,7 +2527,7 @@ msgstr "" "gtk_arrow_get_type\n" #. (itstool) path: sect1/para -#: C/index.docbook:1462 +#: C/index.docbook:1498 msgid "" "Since GTK-Doc 1.8 gtkdoc-scan can generate this " "list for you. Just add \"--rebuild-types\" to SCAN_OPTIONS in " @@ -2825,12 +2540,12 @@ msgstr "" "los tipos de archivo ni tenerlos bajo el control de versiones." #. (itstool) path: sect1/title -#: C/index.docbook:1471 +#: C/index.docbook:1507 msgid "Editing the master document" msgstr "Editar la sección maestra del documento" #. (itstool) path: sect1/para -#: C/index.docbook:1473 +#: C/index.docbook:1509 msgid "" "GTK-Doc produces documentation in DocBook SGML/XML. When processing the " "inline source comments, the GTK-Doc tools generate one documentation page " @@ -2843,7 +2558,7 @@ msgstr "" "documento maestro las incluye y ordena." #. (itstool) path: sect1/para -#: C/index.docbook:1480 +#: C/index.docbook:1516 msgid "" "While GTK-Doc creates a template master document for you, later run will not " "touch it again. This means that one can freely structure the documentation. " @@ -2860,7 +2575,7 @@ msgstr "" "vez en cuando para ver si se han introducido algunas mejoras." #. (itstool) path: tip/para -#: C/index.docbook:1490 +#: C/index.docbook:1526 msgid "" "Do not create tutorials as extra documents. Just write extra chapters. The " "benefit of directly embedding the tutorial for your library into the API " @@ -2875,7 +2590,7 @@ msgstr "" "el tutorial junto con la biblioteca son mayores." #. (itstool) path: sect1/para -#: C/index.docbook:1499 +#: C/index.docbook:1535 msgid "" "So what are the things to change inside the master document? For a start is " "only a little. There are some placeholders (text in square brackets) there " @@ -2886,29 +2601,13 @@ msgstr "" "que habría que encargarse." #. (itstool) path: example/title -#: C/index.docbook:1506 +#: C/index.docbook:1542 msgid "Master document header" msgstr "Cabecera del documento maestro" #. (itstool) path: example/programlisting -#: C/index.docbook:1507 +#: C/index.docbook:1543 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "<bookinfo>\n" -#| " <title>MODULENAME Reference Manual</title>\n" -#| " <releaseinfo>\n" -#| " for MODULENAME [VERSION]\n" -#| " The latest version of this documentation can be found on-line at\n" -#| " <ulink role=\"online-location\" url=\"http://[SERVER]/MODULENAME/index.html\">http://[SERVER]/MODULENAME/</ulink>.\n" -#| " </releaseinfo>\n" -#| "</bookinfo>\n" -#| "\n" -#| "<chapter>\n" -#| " <title>[Insert title here]</title>\n" -#| "\n" -#| " " msgid "" "\n" "<bookinfo>\n" @@ -2937,12 +2636,12 @@ msgstr "" " <title>[Insert title here]</title>\n" #. (itstool) path: sect1/title -#: C/index.docbook:1526 +#: C/index.docbook:1562 msgid "Editing the section file" msgstr "Editar el archivo de sección" #. (itstool) path: sect1/para -#: C/index.docbook:1528 +#: C/index.docbook:1564 msgid "" "The section file is used to organise the documentation output by GTK-Doc. " "Here one specifies which symbol belongs to which module or class and control " @@ -2953,7 +2652,7 @@ msgstr "" "y el control de la visibilidad (pública o privada)." #. (itstool) path: sect1/para -#: C/index.docbook:1534 +#: C/index.docbook:1570 msgid "" "The section file is a plain text file with XML-like syntax (using tags). " "Blank lines are ignored and lines starting with a '#' are treated as comment " @@ -2964,7 +2663,7 @@ msgstr "" "comiencen con «#» se tratan como comentarios." #. (itstool) path: sect1/para -#: C/index.docbook:1540 +#: C/index.docbook:1576 msgid "" "The <FILE> ... </FILE> tag is used to specify the file name, " "without any suffix. For example, using '<FILE>gnome-config</" @@ -2987,7 +2686,7 @@ msgstr "" "clase de GObject convertido a minúscula.)" #. (itstool) path: sect1/para -#: C/index.docbook:1552 +#: C/index.docbook:1588 msgid "" "The <TITLE> ... </TITLE> tag is used to specify the title of the " "section. It is only useful before the templates (if used) are initially " @@ -3001,7 +2700,7 @@ msgstr "" "obsoleto." #. (itstool) path: sect1/para -#: C/index.docbook:1559 +#: C/index.docbook:1595 msgid "" "You can group items in the section by using the <SUBSECTION> tag. " "Currently it outputs a blank line between subsections in the synopsis " @@ -3031,7 +2730,7 @@ msgstr "" "públicas (variables, vmethods)." #. (itstool) path: sect1/para -#: C/index.docbook:1578 +#: C/index.docbook:1614 msgid "" "You can also use <INCLUDE> ... </INCLUDE> to specify the " "#include files which are shown in the synopsis sections. It contains a comma-" @@ -3047,12 +2746,12 @@ msgstr "" "a esa sección." #. (itstool) path: chapter/title -#: C/index.docbook:1592 +#: C/index.docbook:1628 msgid "Controlling the result" msgstr "Controlar el resultado" #. (itstool) path: chapter/para -#: C/index.docbook:1594 +#: C/index.docbook:1630 msgid "" "A GTK-Doc run generates report files inside the documentation directory. The " "generated files are named: <package>-undocumented.txt<package>-undocumented.txt file starts with " "the documentation coverage summary. Below are two sections divided by blank " @@ -3083,7 +2782,7 @@ msgstr "" "documentación pero dónde; p.e. se ha añadido un parámetro nuevo." #. (itstool) path: chapter/para -#: C/index.docbook:1612 +#: C/index.docbook:1648 msgid "" "The <package>-undeclared.txt file lists symbols " "given in the <package>-sections.txt but not found " @@ -3095,7 +2794,7 @@ msgstr "" "eliminado o no se han escrito correctamente." #. (itstool) path: chapter/para -#: C/index.docbook:1619 +#: C/index.docbook:1655 msgid "" "The <package>-unused.txt file lists symbol names, " "where the GTK-Doc scanner has found documentation, but does not know where " @@ -3108,7 +2807,7 @@ msgstr "" "todavía al archivo <paquete>-sections.txt." #. (itstool) path: tip/para -#: C/index.docbook:1627 +#: C/index.docbook:1663 msgid "" "Enable or add the line in Makefile." "am. If at least GTK-Doc 1.9 is installed, this will run sanity checks during " @@ -3119,7 +2818,7 @@ msgstr "" "de integridad durante la ejecución de make check." #. (itstool) path: chapter/para -#: C/index.docbook:1634 +#: C/index.docbook:1670 msgid "" "One can also look at the files produced by the source code scanner: " "<package>-decl-list.txt and <" @@ -3136,7 +2835,7 @@ msgstr "" "si este archivo lo contiene." #. (itstool) path: chapter/para -#: C/index.docbook:1643 +#: C/index.docbook:1679 msgid "" "If the project is GObject based, one can also look into the files produced " "by the object scanner: <package>.args.txt, " @@ -3157,12 +2856,12 @@ msgstr "" "ejecutándolo como GTK_DOC_KEEP_INTERMEDIATE=1 make." #. (itstool) path: chapter/title -#: C/index.docbook:1658 +#: C/index.docbook:1694 msgid "Modernizing the documentation" msgstr "Modernizar la documentación" #. (itstool) path: chapter/para -#: C/index.docbook:1660 +#: C/index.docbook:1696 msgid "" "GTK-Doc has been around for quite some time. In this section we list new " "features together with the version since when it is available." @@ -3171,12 +2870,12 @@ msgstr "" "características nuevas junto con la versión desde la que están disponibles." #. (itstool) path: sect1/title -#: C/index.docbook:1666 +#: C/index.docbook:1702 msgid "GTK-Doc 1.9" msgstr "GTK-Doc 1.9" #. (itstool) path: sect1/para -#: C/index.docbook:1668 +#: C/index.docbook:1704 msgid "" "When using xml instead of sgml, one can actually name the master document " "<package>-docs.xml." @@ -3185,7 +2884,7 @@ msgstr "" "maestro <paquete>-docs.xml." #. (itstool) path: sect1/para -#: C/index.docbook:1673 +#: C/index.docbook:1709 msgid "" "This version supports in " "Makefile.am. When this is enabled, the <" @@ -3206,7 +2905,7 @@ msgstr "" "paquete>-decl-list.txt <paquete>-sections.txt." #. (itstool) path: sect1/para -#: C/index.docbook:1684 +#: C/index.docbook:1720 msgid "" "Version 1.8 already introduced the syntax for documenting sections in the " "sources instead of the separate files under configure.ac." #. (itstool) path: sect1/title -#: C/index.docbook:1694 +#: C/index.docbook:1730 msgid "GTK-Doc 1.10" msgstr "GTK-Doc 1.10" #. (itstool) path: sect1/para -#: C/index.docbook:1696 +#: C/index.docbook:1732 msgid "" "This version supports in " "Makefile.am. When this is enabled, the <" @@ -3245,29 +2944,18 @@ msgstr "" "condicional." #. (itstool) path: sect1/title -#: C/index.docbook:1707 +#: C/index.docbook:1743 msgid "GTK-Doc 1.16" msgstr "GTK-Doc 1.16" #. (itstool) path: example/title -#: C/index.docbook:1713 +#: C/index.docbook:1749 msgid "Enable gtkdoc-check" msgstr "Activar gtkdoc-check" #. (itstool) path: example/programlisting -#: C/index.docbook:1714 +#: C/index.docbook:1750 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "if ENABLE_GTK_DOC\n" -#| "TESTS_ENVIRONMENT = \\\n" -#| " DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \\\n" -#| " SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)\n" -#| "TESTS = $(GTKDOC_CHECK)\n" -#| "endif\n" -#| "\n" -#| " " msgid "" "\n" "if ENABLE_GTK_DOC\n" @@ -3286,7 +2974,7 @@ msgstr "" "endif\n" #. (itstool) path: sect1/para -#: C/index.docbook:1709 +#: C/index.docbook:1745 msgid "" "This version includes a new tool called gtkdoc-check. This tool can run a " "set of sanity checks on your documentation. It is enabled by adding these " @@ -3298,12 +2986,12 @@ msgstr "" "archivo Makefile.am. <_:example-1/>" #. (itstool) path: sect1/title -#: C/index.docbook:1727 +#: C/index.docbook:1763 msgid "GTK-Doc 1.20" msgstr "GTK-Doc 1.20" #. (itstool) path: sect1/para -#: C/index.docbook:1729 +#: C/index.docbook:1765 msgid "" "Version 1.18 brought some initial markdown support. Using markdown in doc " "comments is less intrusive than writing docbook xml. This version improves a " @@ -3317,12 +3005,12 @@ msgstr "" "comentarios contiene todos los detalles." #. (itstool) path: chapter/title -#: C/index.docbook:1740 +#: C/index.docbook:1776 msgid "Documenting other interfaces" msgstr "Documentar otras interfaces" #. (itstool) path: chapter/para -#: C/index.docbook:1742 +#: C/index.docbook:1778 msgid "" "So far we have been using GTK-Doc to document the API of code. The next " "sections contain suggestions how the tools can be used to document other " @@ -3333,12 +3021,12 @@ msgstr "" "herramientas para documentar otras interfaces." #. (itstool) path: sect1/title -#: C/index.docbook:1749 +#: C/index.docbook:1785 msgid "Command line options and man pages" msgstr "Opciones de la línea de comandos y páginas man" #. (itstool) path: sect1/para -#: C/index.docbook:1751 +#: C/index.docbook:1787 msgid "" "As one can generate man pages for a docbook refentry as well, it sounds like " "a good idea to use it for that purpose. This way the interface is part of " @@ -3349,12 +3037,12 @@ msgstr "" "interfaz es parte de la referencia y se obtienen las páginas man sin trabajo." #. (itstool) path: sect2/title -#: C/index.docbook:1758 +#: C/index.docbook:1794 msgid "Document the tool" msgstr "Documentar la herramienta" #. (itstool) path: sect2/para -#: C/index.docbook:1760 +#: C/index.docbook:1796 msgid "" "Create one refentry file per tool. Following our example we would call it meep/" @@ -3369,30 +3057,18 @@ msgstr "" "así como los ejemplos en, por ejemplo, glib." #. (itstool) path: sect2/title -#: C/index.docbook:1770 +#: C/index.docbook:1806 msgid "Adding the extra configure check" msgstr "Añadir la comprobación de configuración adicional" #. (itstool) path: example/title -#: C/index.docbook:1773 C/index.docbook:1791 +#: C/index.docbook:1809 C/index.docbook:1827 msgid "Extra configure checks" msgstr "Comprobaciones de configuración adicionales" #. (itstool) path: example/programlisting -#: C/index.docbook:1774 +#: C/index.docbook:1810 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "AC_ARG_ENABLE(man,\n" -#| " [AC_HELP_STRING([--enable-man],\n" -#| " [regenerate man pages from Docbook [default=no]])],enable_man=yes,\n" -#| " enable_man=no)\n" -#| "\n" -#| "AC_PATH_PROG([XSLTPROC], [xsltproc])\n" -#| "AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)\n" -#| "\n" -#| " " msgid "" "\n" "AC_ARG_ENABLE(man,\n" @@ -3413,32 +3089,13 @@ msgstr "" "AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)\n" #. (itstool) path: sect2/title -#: C/index.docbook:1788 +#: C/index.docbook:1824 msgid "Adding the extra makefile rules" msgstr "Añadir reglas de makefile adicionales" #. (itstool) path: example/programlisting -#: C/index.docbook:1792 +#: C/index.docbook:1828 #, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "man_MANS = \\\n" -#| " meeper.1\n" -#| "\n" -#| "if ENABLE_GTK_DOC\n" -#| "if ENABLE_MAN\n" -#| "\n" -#| "%.1 : %.xml\n" -#| " @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<\n" -#| "\n" -#| "endif\n" -#| "endif\n" -#| "\n" -#| "BUILT_EXTRA_DIST = $(man_MANS)\n" -#| "EXTRA_DIST += meep.xml\n" -#| "\n" -#| " " msgid "" "\n" "man_MANS = \\\n" @@ -3473,12 +3130,12 @@ msgstr "" "EXTRA_DIST += meep.xml\n" #. (itstool) path: sect1/title -#: C/index.docbook:1814 +#: C/index.docbook:1850 msgid "DBus interfaces" msgstr "Interfaces de DBus" #. (itstool) path: sect1/para -#: C/index.docbook:1816 +#: C/index.docbook:1852 msgid "" "(FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://" "cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)" @@ -3487,27 +3144,27 @@ msgstr "" "cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)" #. (itstool) path: chapter/title -#: C/index.docbook:1825 +#: C/index.docbook:1861 msgid "Frequently asked questions" msgstr "Preguntas más frecuentes" #. (itstool) path: segmentedlist/segtitle -#: C/index.docbook:1829 +#: C/index.docbook:1865 msgid "Question" msgstr "Pregunta" #. (itstool) path: segmentedlist/segtitle -#: C/index.docbook:1830 +#: C/index.docbook:1866 msgid "Answer" msgstr "Respuesta" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1832 +#: C/index.docbook:1868 msgid "No class hierarchy." msgstr "Sin jerarquía de clases." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1833 +#: C/index.docbook:1869 msgid "" "The objects xxx_get_type() function has not been " "entered into the <package>.types file." @@ -3516,12 +3173,12 @@ msgstr "" "introducido en el archivo <package>.types." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1839 +#: C/index.docbook:1875 msgid "Still no class hierarchy." msgstr "Aún sin jerarquía de clases." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1840 +#: C/index.docbook:1876 msgid "" "Missing or wrong naming in <package>-sections.txt " "file (see explicación)." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1846 +#: C/index.docbook:1882 msgid "Damn, I have still no class hierarchy." msgstr "Maldición, aún no hay una jerarquía de clases." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1847 +#: C/index.docbook:1883 msgid "" "Is the object name (name of the instance struct, e.g. GtkWidget) part of the normal section (don't put this into Standard or Private " @@ -3548,12 +3205,12 @@ msgstr "" "Estándar o Privado)." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1854 +#: C/index.docbook:1890 msgid "No symbol index." msgstr "Sin índice de símbolos." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1855 +#: C/index.docbook:1891 msgid "" "Does the <package>-docs.{xml,sgml} contain a " "index that xi:includes the generated index?" @@ -3562,12 +3219,12 @@ msgstr "" "«xi:includes» el índice generado?" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1861 +#: C/index.docbook:1897 msgid "Symbols are not linked to their doc-section." msgstr "Los símbolos no se enlazan con su sección en el documento." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1862 +#: C/index.docbook:1898 msgid "" "Is the doc-comment using the correct markup (added #,% or ())? Check if the " "gtkdoc-fixxref warns about unresolvable xrefs." @@ -3576,12 +3233,12 @@ msgstr "" "si gtk-doc-fixxref avisa de alguna referencia xref sin resolver." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1868 +#: C/index.docbook:1904 msgid "A new class does not appear in the docs." msgstr "Una clase nueva no aparece en la documentación." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1869 +#: C/index.docbook:1905 msgid "" "Is the new page xi:included from <package>-docs.{xml,sgml}." @@ -3590,12 +3247,12 @@ msgstr "" "sgml}." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1875 +#: C/index.docbook:1911 msgid "A new symbol does not appear in the docs." msgstr "Un símbolo nuevo no aparece en la documentación." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1876 +#: C/index.docbook:1912 msgid "" "Is the doc-comment properly formatted. Check for spelling mistakes in the " "begin of the comment. Check if the gtkdoc-fixxref warns about unresolvable " @@ -3609,18 +3266,24 @@ msgstr "" "txt en una subsección pública." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1884 +#: C/index.docbook:1920 msgid "A type is missing from the class hierarchy." msgstr "Falta un tipo en la clase de jerarquías" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1885 +#: C/index.docbook:1921 +#| msgid "" +#| "If the type is listed in <package>.hierarchy " +#| "but not in xml/tree_index.sgml then double check " +#| "that the type is correctly placed in the <package>-" +#| "sections.txt. If the type instance (e.g. GtkWidget) is not listed or incidentialy makred private it will not be shown." msgid "" "If the type is listed in <package>.hierarchy but " "not in xml/tree_index.sgml then double check that the " "type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed " -"or incidentialy makred private it will not be shown." +"or incidentally marked private it will not be shown." msgstr "" "Si el tipo está listado en <package>.hierarchy " "pero no en xml/tree_index.sgml, entonces compruebe dos " @@ -3630,14 +3293,14 @@ msgstr "" "privada." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1894 +#: C/index.docbook:1930 msgid "I get foldoc links for all gobject annotations." msgstr "" "Obtengo enlaces de seguimiento de documentos para todas las anotaciones " "gobject." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1895 +#: C/index.docbook:1931 msgid "" "Check that xml/annotation-glossary.xml is xi:included " "from <package>-docs.{xml,sgml}." @@ -3646,14 +3309,14 @@ msgstr "" "included» desde <package>-docs.{xml,sgml}." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1903 +#: C/index.docbook:1939 msgid "Parameter described in source code comment block but does not exist" msgstr "" "Parámetro descrito en el bloque de comentarios del código fuente pero no " "existe" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1904 +#: C/index.docbook:1940 msgid "" "Check if the prototype in the header has different parameter names as in the " "source." @@ -3662,12 +3325,12 @@ msgstr "" "diferentes de la fuente." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1909 +#: C/index.docbook:1945 msgid "multiple \"IDs\" for constraint linkend: XYZ" msgstr "múltiples «ID» para la restricción enlazada: XYZ" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1910 +#: C/index.docbook:1946 msgid "" "Symbol XYZ appears twice in <package>-sections.txt file." @@ -3676,7 +3339,7 @@ msgstr "" "sections.txt." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1913 +#: C/index.docbook:1949 msgid "" "Element typename in namespace '' encountered in para, but no template " "matches." @@ -3685,12 +3348,12 @@ msgstr "" "coincide." #. (itstool) path: chapter/title -#: C/index.docbook:1920 +#: C/index.docbook:1956 msgid "Tools related to gtk-doc" msgstr "Herramientas relacionadas con GTK-Doc" #. (itstool) path: chapter/para -#: C/index.docbook:1922 +#: C/index.docbook:1958 msgid "" "GtkDocPlugin - a Trac " "GTK-Doc integration plugin, that adds API docs to a trac site and " @@ -3701,7 +3364,7 @@ msgstr "" "a un sitio «trac» y se integra con la búsqueda de «trac»." #. (itstool) path: chapter/para -#: C/index.docbook:1927 +#: C/index.docbook:1963 msgid "" "Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since " "tags in the API to determine the minimum required version." @@ -4526,13 +4189,18 @@ msgstr "" #. (itstool) path: sect1/para #: C/index.docbook:527 C/fdl-appendix.xml:527 +#| msgid "" +#| "You may extract a single document from such a collection, and dispbibute " +#| "it individually under this License, provided you insert a copy of this " +#| "License into the extracted document, and follow this License in all other " +#| "respects regarding verbatim copying of that document." msgid "" -"You may extract a single document from such a collection, and dispbibute it " +"You may extract a single document from such a collection, and distribute it " "individually under this License, provided you insert a copy of this License " "into the extracted document, and follow this License in all other respects " "regarding verbatim copying of that document." msgstr "" -" Puede extraer un solo documento de una de tales colecciones y distribuirlo " +"Puede extraer un solo documento de una de tales colecciones y distribuirlo " "individualmente bajo esta Licencia, siempre que inserte una copia de esta " "Licencia en el documento extraído, y siga esta Licencia en todos los demás " "aspectos relativos a la copia literal de dicho documento." @@ -5667,6 +5335,13 @@ msgstr "" "libre que usted elija, como la <_:ulink-1/>, para permitir su uso en " "software libre." +#~ msgid "" +#~ "Also, take a look at GObject Introspection annotation tags: http://live." +#~ "gnome.org/GObjectIntrospection/Annotations" +#~ msgstr "" +#~ "Consulte también las anotaciones de las etiquetas de introspección de " +#~ "GObject: http://live.gnome.org/GObjectIntrospection/Annotations" + #~ msgid "" #~ "DocBook DTD v3.0 - This is the DocBook SGML DTD. " #~ "http://www.ora." @@ -5716,9 +5391,6 @@ msgstr "" #~ "enlace acerca de esto en http://www.ora.com/davenport. NOTA: Esto aún no funciona." -#~ msgid "Installation" -#~ msgstr "Instalación" - #~ msgid "" #~ "There is no standard place where the DocBook Modular Stylesheets are " #~ "installed." diff --git a/help/manual/es/fdl-appendix.xml b/help/manual/es/fdl-appendix.xml index 20a3176..42d6733 100644 --- a/help/manual/es/fdl-appendix.xml +++ b/help/manual/es/fdl-appendix.xml @@ -192,7 +192,7 @@ 6. COLECCIONES DE DOCUMENTOS Puede hacer una colección que conste del Documento y de otros documentos publicados bajo esta Licencia, y reemplazar las copias individuales de esta Licencia en todos los documentos por una sola copia que esté incluida en la colección, siempre que siga las reglas de esta Licencia para cada copia literal de cada uno de los documentos en cualquiera de los demás aspectos. - Puede extraer un solo documento de una de tales colecciones y distribuirlo individualmente bajo esta Licencia, siempre que inserte una copia de esta Licencia en el documento extraído, y siga esta Licencia en todos los demás aspectos relativos a la copia literal de dicho documento. + Puede extraer un solo documento de una de tales colecciones y distribuirlo individualmente bajo esta Licencia, siempre que inserte una copia de esta Licencia en el documento extraído, y siga esta Licencia en todos los demás aspectos relativos a la copia literal de dicho documento. diff --git a/help/manual/es/index.docbook b/help/manual/es/index.docbook index 77f252a..9fe9683 100644 --- a/help/manual/es/index.docbook +++ b/help/manual/es/index.docbook @@ -34,7 +34,8 @@ - 1.20.1 16 de febrero de 2014 ss versión de desarrollo + 1.21.1 18 de julio de 2014 ss versión de desarrollo + 1.21 17 de julio de 2014 ss correcciones de errores, eliminadas funcionalidades obsoletas 1.20 16 de febrero de 2014 ss errores corregidos, soporte de marcado, mejoras en los estilos 1.19 05 de junio de 2013 ss correcciones de errores 1.18 14 de septiembre de 2011 ss correcciones de errores, mejoras en la velocidad y soporte de marcado @@ -56,7 +57,7 @@ - 2009-2014 + 2009-2015 Daniel Mustieles @@ -298,7 +299,8 @@ make Integración con los sistemas de control de versiones - Como regla principal, son los archivos que edita los que deberían estar bajo el control de versiones. Para proyectos típicos son los archivos: <paquete>.types, <paquete>-docs.xml (.sgml en el pasado), <paquete>-sections.txt y Makefile.am. + Como regla principal, son los archivos que edita los que deberían estar bajo el control de versiones. Para proyectos típicos son los archivos: <paquete>.types, <paquete>-docs.xml (anteriormente .sgml), <paquete>-sections.txt, Makefile.am. + Los archivos de las carpetas xml/ y html/ No deberían estar bajo control de versiones. Tampoco ninguno de los archivos .stamp. @@ -311,9 +313,9 @@ make DOC_MODULE=meep // sources have changed -gtkdoc-scan --module=$(DOC_MODULE) --source-dir=... +gtkdoc-scan --module=$(DOC_MODULE) <source-dir> gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir=<source-dir> // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -346,6 +348,15 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -405,6 +416,12 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html DocBook puede crear algo más que enlaces. También se pueden tener listas, ejemplos, cabeceras e imágenes. En la versión 1.20, la manera prefefira de hacer esto es usando un subconjunto de la sintaxis básica de formateado de texto llamada Marcado. En versiones anteriores de GTK-Doc, cualquier documentación que incluya marcado se renderizará como tal. Por ejemplo, los elementos de una lista aparecerán como líneas que empiezan con un guión. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + En versiones anteriores de GTK-Doc, si necesitaba soporte para formato adicional, necesitaba activar el uso de etiquetas SGML/XML dentro de comentarios en la documentación poniendo o en la variable MKDB_OPTIONS dentro de Makefile.am. @@ -451,7 +468,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html Se pueden encontrar más ejemplos de las etiquetas de marcado soportadas en el Manual de referencia de sintaxis de marcado de documentación de GTK+. - Tal y como se ha mencionado antes, la documentación anterior de GTK-Doc es para documentar la API pública .Por ello, no se puede escribir documentación para los símbolos estáticos. No obstante es una buena práctica comentar los símbolos. Esto ayuda a que otros entiendan su código. Por ello se recomienda comentarlos usando comentarios normales (sin el segundo «*» en la primera línea). Si la función, posteriormente, se debe hacer pública, todo lo que el programador debe hacer es añadir otro «*» en el bloque de comentario e introducir el nombre del símbolo en la parte derecha dentro del archivo de secciones. + Tal y como se ha mencionado antes, la documentación anterior de GTK-Doc es para documentar la API pública .Por ello, no se puede escribir documentación para los símbolos estáticos. No obstante es una buena práctica comentar los símbolos. Esto ayuda a que otros entiendan su código. Por ello se recomienda comentarlos usando comentarios normales (sin el segundo «*» en la primera línea). Si la función, posteriormente, se debe hacer pública, todo lo que el programador debe hacer es añadir otro «*» en el bloque de comentario e introducir el nombre del símbolo en la parte derecha dentro del archivo de secciones. @@ -571,8 +588,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (ARREGLAR: estabilidad de la información) - + (ARREGLAR: estabilidad de la información) + Etiquetas generales /** @@ -594,6 +611,32 @@ foo_get_bar(Foo *foo) + Anotaciones + + Los bloques de documentación pueden contener etiquetas de anotaciones. Estas etiquetas se renderizarán con consejos que describan su significado. Las etiquetas se usan en la introspección de GObject para generar vinculaciones del lenguaje. Puede obtener una lista detallada de las etiquetas soportadas en el wiki. + + Anotaciones + +/** + * foo_get_bar: (annotation) + * @foo: (annotation): some foo + * + * Retrieves @foo's bar. + * + * Returns: (annotation): @foo's bar + */ +... +/** + * foo_set_bar_using_the_frobnicator: (annotation) (another annotation) + * (and another annotation) + * @foo: (annotation) (another annotation): some foo + * + * Sets bar on @foo. + */ + + + + Bloque de comentario de función Recuerde: @@ -610,8 +653,6 @@ foo_get_bar(Foo *foo) GTK-Doc asume que todos los símbolos (macros, funciones) que empiezan por «_» son privados. Se tratan como funciones estáticas. - Consulte también las anotaciones de las etiquetas de introspección de GObject: http://live.gnome.org/GObjectIntrospection/Annotations - Bloque de comentario de función /** @@ -961,7 +1002,15 @@ gtk_arrow_get_type Esta versión soporta en Makefile.am. Cuando está activada, el archivo <paquete>-sections.txt se genera automáticamente y se puede quitar del control de versiones. Esto sólo funciona en proyectos que tienen una estructura regular (ej. cada pareja .{c,h} creará una sección nueva). Si se organiza un proyecto parecido a esto, actualizar una sección mantenida manualmente puede ser tan sencillo como ejecutar meld <paquete>-decl-list.txt <paquete>-sections.txt. - La versión 1.18 ya introdujo la sintaxis para documentar secciones en las fuentes en lugar de tener que hacerlo en archivos separados bajo tmpl. Esta versión añade opciones para cambiar todo el módulo «doc» del documento para que no realice el paso de construcción de tmpl adicional, usando en configure.ac. + + Version 1.8 already introduced the syntax for documenting sections in + the sources instead of the separate files under tmpl. + This version adds options to switch the whole doc module to not use the + extra tmpl build step at all, by using + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. + @@ -1323,7 +1372,7 @@ EXTRA_DIST += meep.xml 6. COLECCIONES DE DOCUMENTOS Puede hacer una colección que conste del Documento y de otros documentos publicados bajo esta Licencia, y reemplazar las copias individuales de esta Licencia en todos los documentos por una sola copia que esté incluida en la colección, siempre que siga las reglas de esta Licencia para cada copia literal de cada uno de los documentos en cualquiera de los demás aspectos. - Puede extraer un solo documento de una de tales colecciones y distribuirlo individualmente bajo esta Licencia, siempre que inserte una copia de esta Licencia en el documento extraído, y siga esta Licencia en todos los demás aspectos relativos a la copia literal de dicho documento. + Puede extraer un solo documento de una de tales colecciones y distribuirlo individualmente bajo esta Licencia, siempre que inserte una copia de esta Licencia en el documento extraído, y siga esta Licencia en todos los demás aspectos relativos a la copia literal de dicho documento. diff --git a/help/manual/fr/fdl-appendix.xml b/help/manual/fr/fdl-appendix.xml index 7471ee7..ef18f36 100644 --- a/help/manual/fr/fdl-appendix.xml +++ b/help/manual/fr/fdl-appendix.xml @@ -192,7 +192,13 @@ 6. REGROUPEMENTS DE DOCUMENTS Vous pouvez créer un regroupement de documents comprenant le Document d'autres documents soumis à cette Licence, et remplacer les copies individuelles de cette Licence des différents documents par une unique copie incluse dans le regroupement de documents, à condition de respecter pour chacun de ces documents l'ensemble des règles de cette Licence concernant les copies conformes. - Vous pouvez extraire un document d'un tel regroupement et le distribuer individuellement sous couvert de cette Licence, à condition d'y inclure une copie de cette Licence et d'en respecter l'ensemble des règles concernant les copies conformes. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/fr/index.docbook b/help/manual/fr/index.docbook index 096d72a..572d9d5 100644 --- a/help/manual/fr/index.docbook +++ b/help/manual/fr/index.docbook @@ -46,11 +46,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -396,12 +402,17 @@ make Intégration avec des systèmes de gestion de versions - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -415,9 +426,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -445,7 +456,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -540,12 +560,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -596,7 +621,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - Comme indiqué plus tôt, GTK-Doc est fait pour documenter les API publiques. On ne peut donc pas écrire de la documentation pour les symboles statiques. Néanmoins, il est bon de commenter ces symboles aussi. Cela aide les autres à comprendre votre code. Par conséquent, nous recommandons de les documenter à l'aide de commentaires normaux (sans le second « * » à la première ligne). Si, plus tard, la fonction doit être rendue publique, il suffira juste d'ajouter un « * » dans le bloc de commentaires et d'ajouter le nom du symbole à la bonne place à l'intérieur du fichier des sections. + Comme indiqué plus tôt, GTK-Doc est fait pour documenter les API publiques. On ne peut donc pas écrire de la documentation pour les symboles statiques. Néanmoins, il est bon de commenter ces symboles aussi. Cela aide les autres à comprendre votre code. Par conséquent, nous recommandons de les documenter à l'aide de commentaires normaux (sans le second « * » à la première ligne). Si, plus tard, la fonction doit être rendue publique, il suffira juste d'ajouter un « * » dans le bloc de commentaires et d'ajouter le nom du symbole à la bonne place à l'intérieur du fichier des sections. @@ -749,8 +774,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : informations de stabilité) - + (FIXME : informations de stabilité) + Étiquettes générales + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Bloc de commentaires pour les fonctions N'oubliez pas : @@ -788,13 +845,6 @@ foo_get_bar(Foo *foo) GTK-Doc considère que tous les symboles (macros, fonctions) commençant par « _ » sont privés. Ils sont traités comme des fonctions statiques. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - Bloc de commentaires pour les fonctions tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1374,7 +1426,13 @@ EXTRA_DIST += meep.xml Un type est absent dans la hiérarchie de classe. - Si le type est listé dans <module>.hierarchy mais pas dans xml/tree_index.sgml alors contrôlez deux-fois que le type est correctement placé dans <module>-sections.txt. Si l'instance du type (par ex. GtkWidget) n'est pas listée ou marquée par accident comme privée, elle ne sera pas affichée. + + If the type is listed in <package>.hierarchy + but not in xml/tree_index.sgml then double check + that the type is correctly placed in the <package>-sections.txt. + If the type instance (e.g. GtkWidget) is not listed or + incidentally marked private it will not be shown. + J'obtiens des liens foldoc pour toutes les annotations gobject. @@ -1607,7 +1665,13 @@ EXTRA_DIST += meep.xml 6. REGROUPEMENTS DE DOCUMENTS Vous pouvez créer un regroupement de documents comprenant le Document et d'autres documents soumis à cette Licence, et remplacer les copies individuelles de cette Licence des différents documents par une unique copie incluse dans le regroupement de documents, à condition de respecter pour chacun de ces documents l'ensemble des règles de cette Licence concernant les copies conformes. - Vous pouvez extraire un document d'un tel regroupement et le distribuer individuellement sous couvert de cette Licence, à condition d'y inclure une copie de cette Licence et d'en respecter l'ensemble des règles concernant les copies conformes. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/gl/fdl-appendix.xml b/help/manual/gl/fdl-appendix.xml new file mode 100644 index 0000000..b6bd653 --- /dev/null +++ b/help/manual/gl/fdl-appendix.xml @@ -0,0 +1,621 @@ + + + + + + Version 1.1, March 2000 + + + 2000Free Software Foundation, Inc. + + + +
Free Software Foundation, Inc. 51 Franklin Street, + Suite 330, Boston, MA + 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + + + + GNU Free Documentation License + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or + other written document free in the sense of + freedom: to assure everyone the effective freedom to copy and + redistribute it, with or without modifying it, either + commercially or noncommercially. Secondarily, this License + preserves for the author and publisher a way to get credit for + their work, while not being considered responsible for + modifications made by others. + + + + This License is a kind of copyleft, which means + that derivative works of the document must themselves be free in + the same sense. It complements the GNU General Public License, + which is a copyleft license designed for free software. + + + + We have designed this License in order to use it for manuals for + free software, because free software needs free documentation: a + free program should come with manuals providing the same + freedoms that the software does. But this License is not limited + to software manuals; it can be used for any textual work, + regardless of subject matter or whether it is published as a + printed book. We recommend this License principally for works + whose purpose is instruction or reference. + + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work that contains a + notice placed by the copyright holder saying it can be + distributed under the terms of this License. The + Document, below, refers to any such manual or + work. Any member of the public is a licensee, and is addressed + as you. + + + + A Modified Version of the Document means any work + containing the Document or a portion of it, either copied + verbatim, or with modifications and/or translated into another + language. + + + + A Secondary Section is a named appendix or a + front-matter section of the Document that deals exclusively + with the relationship of the publishers or authors of the + Document to the Document's overall subject (or to related + matters) and contains nothing that could fall directly within + that overall subject. (For example, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of + legal, commercial, philosophical, ethical or political position + regarding them. + + + + The Invariant Sections are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the + notice that says that the Document is released under this + License. + + + + The Cover Texts are certain short passages of + text that are listed, as Front-Cover Texts or Back-Cover Texts, + in the notice that says that the Document is released under this + License. + + + + A Transparent copy of the Document means a machine-readable + copy, represented in a format whose specification is available + to the general public, whose contents can be viewed and edited + directly and straightforwardly with generic text editors or (for + images composed of pixels) generic paint programs or (for + drawings) some widely available drawing editor, and that is + suitable for input to text formatters or for automatic + translation to a variety of formats suitable for input to text + formatters. A copy made in an otherwise Transparent file format + whose markup has been designed to thwart or discourage + subsequent modification by readers is not Transparent. A copy + that is not Transparent is called + Opaque. + + + + Examples of suitable formats for Transparent copies include + plain ASCII without markup, Texinfo input format, LaTeX input + format, SGML or XML using a publicly available DTD, and + standard-conforming simple HTML designed for human + modification. Opaque formats include PostScript, PDF, + proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD + and/or processing tools are not generally available, and the + machine-generated HTML produced by some word processors for + output purposes only. + + + + The Title Page means, for a printed book, the + title page itself, plus such following pages as are needed to + hold, legibly, the material this License requires to appear in + the title page. For works in formats which do not have any title + page as such, Title Page means the text near the + most prominent appearance of the work's title, preceding the + beginning of the body of the text. + + + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License + applies to the Document are reproduced in all copies, and that + you add no other conditions whatsoever to those of this + License. You may not use technical measures to obstruct or + control the reading or further copying of the copies you make or + distribute. However, you may accept compensation in exchange for + copies. If you distribute a large enough number of copies you + must also follow the conditions in section 3. + + + + You may also lend copies, under the same conditions stated + above, and you may publicly display copies. + + + + + 3. COPIANDO EN CANTIDADE + + If you publish printed copies of the Document numbering more than 100, + and the Document's license notice requires Cover Texts, you must enclose + the copies in covers that carry, clearly and legibly, all these + Cover Texts: Front-Cover Texts on the front cover, and + Back-Cover Texts on the back cover. Both covers must also + clearly and legibly identify you as the publisher of these + copies. The front cover must present the full title with all + words of the title equally prominent and visible. You may add + other material on the covers in addition. Copying with changes + limited to the covers, as long as they preserve the title of the + Document and satisfy these + conditions, can be treated as verbatim copying in other + respects. + + + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto + adjacent pages. + + + + If you publish or distribute Opaque copies of the Document numbering more than 100, + you must either include a machine-readable Transparent copy along with + each Opaque copy, or state in or with each Opaque copy a + publicly-accessible computer-network location containing a + complete Transparent copy of the Document, free of added + material, which the general network-using public has access to + download anonymously at no charge using public-standard network + protocols. If you use the latter option, you must take + reasonably prudent steps, when you begin distribution of Opaque + copies in quantity, to ensure that this Transparent copy will + remain thus accessible at the stated location until at least one + year after the last time you distribute an Opaque copy (directly + or through your agents or retailers) of that edition to the + public. + + + + It is requested, but not required, that you contact the authors + of the Document well before + redistributing any large number of copies, to give them a chance + to provide you with an updated version of the Document. + + + + + 4. MODIFICACIÓNS + + You may copy and distribute a Modified Version of the Document under the conditions of + sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the + Modified Version filling the role of the Document, thus + licensing distribution and modification of the Modified Version + to whoever possesses a copy of it. In addition, you must do + these things in the Modified Version: + + + + + + A + + Use in the Title + Page (and on the covers, if any) a title distinct + from that of the Document, and from those of + previous versions (which should, if there were any, be + listed in the History section of the Document). You may + use the same title as a previous version if the original + publisher of that version gives permission. + + + + + + + B + + List on the Title + Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the + Modified Version, + together with at least five of the principal authors of + the Document (all of + its principal authors, if it has less than five). + + + + + + + C + + State on the Title + Page the name of the publisher of the Modified Version, as the + publisher. + + + + + + + D + + Preserve all the copyright notices of the Document. + + + + + + + E + + Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + + + + + + + F + + Include, immediately after the copyright notices, a + license notice giving the public permission to use the + Modified Version under + the terms of this License, in the form shown in the + Addendum below. + + + + + + + G + + Preserve in that license notice the full lists of Invariant Sections and + required Cover + Texts given in the Document's license notice. + + + + + + + H + + Include an unaltered copy of this License. + + + + + + + I + + Preserve the section entitled History, and + its title, and add to it an item stating at least the + title, year, new authors, and publisher of the Modified Version as given on + the Title Page. If + there is no section entitled History in the + Document, create one + stating the title, year, authors, and publisher of the + Document as given on its Title Page, then add an item + describing the Modified Version as stated in the previous + sentence. + + + + + + + J + + Preserve the network location, if any, given in the Document for public access + to a Transparent + copy of the Document, and likewise the network locations + given in the Document for previous versions it was based + on. These may be placed in the History + section. You may omit a network location for a work that + was published at least four years before the Document + itself, or if the original publisher of the version it + refers to gives permission. + + + + + + + K + + In any section entitled Acknowledgements or + Dedications, preserve the section's title, + and preserve in the section all the substance and tone of + each of the contributor acknowledgements and/or + dedications given therein. + + + + + + + L + + Preserve all the Invariant + Sections of the Document, unaltered in their + text and in their titles. Section numbers or the + equivalent are not considered part of the section titles. + + + + + + + M + + Delete any section entitled + Endorsements. Such a section may not be + included in the Modified + Version. + + + + + + + N + + Do not retitle any existing section as + Endorsements or to conflict in title with + any Invariant + Section. + + + + + + + If the Modified Version + includes new front-matter sections or appendices that qualify as + Secondary Sections and + contain no material copied from the Document, you may at your + option designate some or all of these sections as invariant. To + do this, add their titles to the list of Invariant Sections in the + Modified Version's license notice. These titles must be + distinct from any other section titles. + + + + You may add a section entitled Endorsements, + provided it contains nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text + has been approved by an organization as the authoritative + definition of a standard. + + + + You may add a passage of up to five words as a Front-Cover Text, and a passage + of up to 25 words as a Back-Cover Text, to the end of + the list of Cover Texts + in the Modified Version. + Only one passage of Front-Cover Text and one of Back-Cover Text + may be added by (or through arrangements made by) any one + entity. If the Document + already includes a cover text for the same cover, previously + added by you or by arrangement made by the same entity you are + acting on behalf of, you may not add another; but you may + replace the old one, on explicit permission from the previous + publisher that added the old one. + + + + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to + assert or imply endorsement of any Modified Version . + + + + + 5. COMBINING DOCUMENTS + + You may combine the Document + with other documents released under this License, under the + terms defined in section 4 + above for modified versions, provided that you include in the + combination all of the Invariant + Sections of all of the original documents, unmodified, + and list them all as Invariant Sections of your combined work in + its license notice. + + + + The combined work need only contain one copy of this License, + and multiple identical Invariant + Sections may be replaced with a single copy. If there are + multiple Invariant Sections with the same name but different + contents, make the title of each such section unique by adding + at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique + number. Make the same adjustment to the section titles in the + list of Invariant Sections in the license notice of the combined + work. + + + + In the combination, you must combine any sections entitled + History in the various original documents, + forming one section entitled History; likewise + combine any sections entitled Acknowledgements, + and any sections entitled Dedications. You must + delete all sections entitled Endorsements. + + + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies + of this License in the various documents with a single copy that + is included in the collection, provided that you follow the + rules of this License for verbatim copying of each of the + documents in all other respects. + + + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + + + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with + other separate and independent documents or works, in or on a + volume of a storage or distribution medium, does not as a whole + count as a Modified Version + of the Document, provided no compilation copyright is claimed + for the compilation. Such a compilation is called an + aggregate, and this License does not apply to the + other self-contained works thus compiled with the Document , on + account of their being thus compiled, if they are not themselves + derivative works of the Document. If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one + quarter of the entire aggregate, the Document's Cover Texts may + be placed on covers that surround only the Document within the + aggregate. Otherwise they must appear on covers around the whole + aggregate. + + + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. Replacing Invariant Sections with + translations requires special permission from their copyright + holders, but you may include translations of some or all + Invariant Sections in addition to the original versions of these + Invariant Sections. You may include a translation of this + License provided that you also include the original English + version of this License. In case of a disagreement between the + translation and the original English version of this License, + the original English version will prevail. + + + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except as expressly + provided for under this License. Any other attempt to copy, + modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software + Foundation may publish new, revised versions of the GNU + Free Documentation License from time to time. Such new versions + will be similar in spirit to the present version, but may differ + in detail to address new problems or concerns. See http://www.gnu.org/copyleft/. + + + + Each version of the License is given a distinguishing version + number. If the Document + specifies that a particular numbered version of this License + or any later version applies to it, you have the + option of following the terms and conditions either of that + specified version or of any later version that has been + published (not as a draft) by the Free Software Foundation. If + the Document does not specify a version number of this License, + you may choose any version ever published (not as a draft) by + the Free Software Foundation. + + + + + Addendum + + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + + +
+ + Copyright YEAR YOUR NAME. + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License, Version 1.1 or any later version published by the + Free Software Foundation; with the Invariant Sections being LIST + THEIR TITLES, with the Front-Cover Texts being LIST, + and with the Back-Cover + Texts being LIST. A copy of the license is included in + the section entitled GNU Free Documentation + License. + +
+ + + If you have no Invariant + Sections, write with no Invariant Sections + instead of saying which ones are invariant. If you have no + Front-Cover Texts, write + no Front-Cover Texts instead of + Front-Cover Texts being LIST; likewise for Back-Cover Texts. + + + + If your document contains nontrivial examples of program code, + we recommend releasing these examples in parallel under your + choice of free software license, such as the GNU General Public + License, to permit their use in free software. + + + diff --git a/help/manual/gl/gl.po b/help/manual/gl/gl.po new file mode 100644 index 0000000..ffcb946 --- /dev/null +++ b/help/manual/gl/gl.po @@ -0,0 +1,3842 @@ +# Galician translation for gtk-doc. +# Copyright (C) 2014 gtk-doc's COPYRIGHT HOLDER +# This file is distributed under the same license as the gtk-doc package. +# Fran Dieguez , 2014. +msgid "" +msgstr "" +"Project-Id-Version: gtk-doc master\n" +"POT-Creation-Date: 2014-09-22 21:18+0000\n" +"PO-Revision-Date: 2014-09-23 02:11+0200\n" +"Last-Translator: Fran Dieguez \n" +"Language-Team: gnome-l10n-gl@gnome.org\n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "Fran Diéguez , 2014." + +#. (itstool) path: bookinfo/title +#: C/index.docbook:12 +msgid "GTK-Doc Manual" +msgstr "Manual de GTK-Doc" + +#. (itstool) path: bookinfo/edition +#: C/index.docbook:13 +msgid "1.20" +msgstr "1.20" + +#. (itstool) path: abstract/para +#: C/index.docbook:14 +msgid "User manual for developers with instructions of GTK-Doc usage." +msgstr "" +"Manual de usuarios para desenvolvedores con instrucións do uso de GTK-Doc." + +#. (itstool) path: authorgroup/author +#: C/index.docbook:16 +msgid "" +"Chris Lyttle " +"
chris@wilddev.net
" +msgstr "" +"Chris Lyttle " +"
chris@wilddev.net
" + +#. (itstool) path: authorgroup/author +#: C/index.docbook:25 +msgid "" +"Dan Mueth
" +"d-mueth@uchicago.edu
" +msgstr "" +"Dan Mueth
" +"d-mueth@uchicago.edu
" + +#. (itstool) path: authorgroup/author +#: C/index.docbook:34 +msgid "" +"Stefan Sauer (Kost) " +"
ensonic@users.sf.net
" +msgstr "" +"Stefan Sauer (Kost) " +"
ensonic@users.sf.net
" + +#. (itstool) path: publisher/publishername +#: C/index.docbook:45 +msgid "GTK-Doc project" +msgstr "Proxecto GTK-Doc" + +#. (itstool) path: bookinfo/publisher +#: C/index.docbook:44 +msgid "" +"<_:publishername-1/>
gtk-doc-list@gnome.org
" +msgstr "" +"<_:publishername-1/>
gtk-doc-list@gnome.org
" + +#. (itstool) path: bookinfo/copyright +#: C/index.docbook:48 +msgid "2000, 2005 Dan Mueth and Chris Lyttle" +msgstr "2000, 2005 Dan Mueth and Chris Lyttle" + +#. (itstool) path: bookinfo/copyright +#: C/index.docbook:52 +msgid "2007-2014 Stefan Sauer (Kost)" +msgstr "2007-2014 Stefan Sauer (Kost)" + +#. (itstool) path: legalnotice/para +#: C/index.docbook:65 +msgid "" +"Permission is granted to copy, distribute and/or modify this document under " +"the terms of the GNU Free Documentation License, " +"Version 1.1 or any later version published by the Free Software Foundation " +"with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A " +"copy of the license is included." +msgstr "" +"Pode copiar, distribuír e modificar este documento baixo os termos da " +"Licenza de Documentación Libre GNU, na súa versión " +"1.1 ou posterior, publicada pola Free Software Foundation, sen seccións " +"invariantes e sen textos de portada ou de contraportada. Inclúese unha cópida da licenza." + +#. (itstool) path: legalnotice/para +#: C/index.docbook:73 +msgid "" +"Many of the names used by companies to distinguish their products and " +"services are claimed as trademarks. Where those names appear in any GNOME " +"documentation, and those trademarks are made aware to the members of the " +"GNOME Documentation Project, the names have been printed in caps or initial " +"caps." +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:83 +msgid "" +"1.21.1 18 Jul 2014 ss development version" +msgstr "" +"1.21.1 18 de Xullo de 2014 " +"ss versión de " +"desenvolvemento" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:89 +msgid "" +"1.21 17 Jul 2014 ss bug fixes, dropping deprecated features" +msgstr "" +"1.21 17 de Xullo de 2014 " +"ss arranxos de erros, retirado " +"de características obsoletas" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:95 +msgid "" +"1.20 16 Feb 2014 ss bug fixes, markdown support, style improvements" +msgstr "" +"1.20 16 de Febreiro de 2014 " +"ss arranxos de erros, " +"compatibilidade de markdown, melloras de estilo" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:101 +msgid "" +"1.19 05 Jun 2013 ss bug fixes" +msgstr "" +"1.19 05 de Xuño de 2013 " +"ss arranxos de erros" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:107 +msgid "" +"1.18 14 Sep 2011 ss bug fixes, speedups, markdown support" +msgstr "" +"1.18 14 de Setembro de 2011 " +"ss arranxos de erros, melloras " +"de velocidade, compatibilidade de markdown" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:113 +msgid "" +"1.17 26 Feb 2011 sk urgent bug fix update" +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:119 +msgid "" +"1.16 14 Jan 2011 sk bugfixes, layout improvements" +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:125 +msgid "" +"1.15 21 May 2010 sk bug and regression fixes" +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:131 +msgid "" +"1.14 28 March 2010 sk bugfixes and performance improvements" +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:137 +msgid "" +"1.13 18 December 2009 " +"sk broken tarball update" +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:143 +msgid "" +"1.12 18 December 2009 " +"sk new tool features and " +"bugfixes" +msgstr "" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:149 +msgid "" +"1.11 16 November 2008 " +"mal GNOME doc-utils migration" +msgstr "" + +#. (itstool) path: chapter/title +#: C/index.docbook:162 +msgid "Introduction" +msgstr "" + +#. (itstool) path: chapter/para +#: C/index.docbook:164 +msgid "" +"This chapter introduces GTK-Doc and gives an overview of what it is and how " +"it is used." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:170 +msgid "What is GTK-Doc?" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:172 +msgid "" +"GTK-Doc is used to document C code. It is typically used to document the " +"public API of libraries, such as the GTK+ and GNOME libraries. But it can " +"also be used to document application code." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:180 +msgid "How Does GTK-Doc Work?" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:182 +msgid "" +"GTK-Doc works by using documentation of functions placed inside the source " +"files in specially-formatted comment blocks, or documentation added to the " +"template files which GTK-Doc uses (though note that GTK-Doc will only " +"document functions that are declared in header files; it won't produce " +"output for static functions)." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:189 +msgid "" +"GTK-Doc consists of a number of perl scripts, each performing a different " +"step in the process." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:194 +msgid "There are 5 main steps in the process:" +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:201 +msgid "" +"Writing the documentation. The author fills in the " +"source files with the documentation for each function, macro, union etc. (In " +"the past information was entered in generated template files, which is not " +"recommended anymore)." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:211 +msgid "" +"Gathering information about the code. " +"gtkdoc-scan scans the header files of the code " +"looking for declarations of functions, macros, enums, structs, and unions. " +"It creates the file <module>-decl-list.txt " +"containing a list of the declarations, placing them into sections according " +"to which header file they are in. On the first run this file is copied to " +"<module>-sections.txt. The author can rearrange " +"the sections, and the order of the declarations within them, to produce the " +"final desired order. The second file it generates is <" +"module>-decl.txt. This file contains the full declarations " +"found by the scanner. If for some reason one would like some symbols to show " +"up in the docs, where the full declaration cannot be found by the scanner or " +"the declaration should appear differently, one can place entities similar to " +"the ones in <module>-decl.txt into <" +"module>-overrides.txt." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:228 +msgid "" +"gtkdoc-scangobj can also be used to dynamically " +"query a library about any GObject subclasses it exports. It saves " +"information about each object's position in the class hierarchy and about " +"any GObject properties and signals it provides." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:234 +msgid "" +"gtkdoc-scanobj should not be used anymore. It was " +"needed in the past when GObject was still GtkObject inside gtk+." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:241 +msgid "" +"Generating the \"template\" files. gtkdoc-" +"mktmpl creates a number of files in the tmpl/ subdirectory, using the information gathered " +"in the first step. (Note that this can be run repeatedly. It will try to " +"ensure that no documentation is ever lost.)" +msgstr "" + +#. (itstool) path: note/para +#: C/index.docbook:250 +msgid "" +"Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep " +"documentation in the code. gtkdocize supports now " +"a option that chooses a makefile that " +"skips tmpl usage totally. If you have never changed file in tmpl by hand, " +"please remove the directory (e.g. from version control system)." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:262 +msgid "" +"Generating the SGML/XML and HTML/PDF. " +"gtkdoc-mkdb turns the template files into SGML or " +"XML files in the sgml/ or xml/ subdirectory. If the source code " +"contains documentation on functions, using the special comment blocks, it " +"gets merged in here. If there are no tmpl files used it only reads docs from " +"sources and introspection data. We recommend to use Docbook XML." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:273 +msgid "" +"gtkdoc-mkhtml turns the SGML/XML files into HTML " +"files in the html/ subdirectory. " +"Likewise gtkdoc-mkpdf turns the SGML/XML files " +"into a PDF document called <package>.pdf." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:279 +msgid "" +"Files in sgml/ or xml/ and html/ directories are always overwritten. One should never edit them " +"directly." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:287 +msgid "" +"Fixing up cross-references between documents. After " +"installing the HTML files, gtkdoc-fixxref can be " +"run to fix up any cross-references between separate documents. For example, " +"the GTK+ documentation contains many cross-references to types documented in " +"the GLib manual. When creating the source tarball for distribution, " +"gtkdoc-rebase turns all external links into web-" +"links. When installing distributed (pregenerated) docs the same application " +"will try to turn links back to local links (where those docs are installed)." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:305 +msgid "Getting GTK-Doc" +msgstr "" + +#. (itstool) path: sect2/title +#: C/index.docbook:308 +msgid "Requirements" +msgstr "" + +#. (itstool) path: sect2/para +#: C/index.docbook:309 +msgid "Perl v5 - the main scripts are in Perl." +msgstr "" + +#. (itstool) path: sect2/para +#: C/index.docbook:312 +msgid "" +"xsltproc - the xslt processor from libxslt xmlsoft.org/XSLT/" +msgstr "" + +#. (itstool) path: sect2/para +#: C/index.docbook:316 +msgid "" +"docbook-xsl - the docbook xsl stylesheets sourceforge.net/projects/docbook/files/docbook-xsl" +msgstr "" + +#. (itstool) path: sect2/para +#: C/index.docbook:320 +msgid "Python - optional - for gtkdoc-depscan" +msgstr "" + +#. (itstool) path: sect2/para +#: C/index.docbook:323 +msgid "" +"One of source-highlight, highlight " +"or vim - optional - used for syntax highlighting of " +"examples" +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:331 +msgid "About GTK-Doc" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:333 C/index.docbook:347 +msgid "(FIXME)" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:337 +msgid "" +"(History, authors, web pages, mailing list, license, future plans, " +"comparison with other similar systems.)" +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:345 +msgid "About this Manual" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:351 +msgid "(who it is meant for, where you can get it, license)" +msgstr "" + +#. (itstool) path: chapter/title +#: C/index.docbook:360 +msgid "Setting up your project" +msgstr "" + +#. (itstool) path: chapter/para +#: C/index.docbook:362 +msgid "" +"The next sections describe what steps to perform to integrate GTK-Doc into " +"your project. Theses sections assume we work on a project called 'meep'. " +"This project contains a library called 'libmeep' and an end-user app called " +"'meeper'. We also assume you will be using autoconf and automake. In " +"addition section plain makefiles or other " +"build systems will describe the basics needed to work in a different " +"build setup." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:373 +msgid "Setting up a skeleton documentation" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:375 +msgid "" +"Under your top-level project directory create folders called docs/reference " +"(this way you can also have docs/help for end-user documentation). It is " +"recommended to create another subdirectory with the name of the doc-package. " +"For packages with just one library this step is not necessary." +msgstr "" + +#. (itstool) path: example/title +#: C/index.docbook:384 +msgid "Example directory structure" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:385 +#, no-wrap +msgid "" +"\n" +"meep/\n" +" docs/\n" +" reference/\n" +" libmeep/\n" +" meeper/\n" +" src/\n" +" libmeep/\n" +" meeper/\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:382 +msgid "This can then look as shown below: <_:example-1/>" +msgstr "" + +#. (itstool) path: sect1/title +#. (itstool) path: example/title +#: C/index.docbook:400 C/index.docbook:407 +msgid "Integration with autoconf" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:402 +msgid "" +"Very easy! Just add one line to your configure.ac " +"script." +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:408 +#, no-wrap +msgid "" +"\n" +"# check for gtk-doc\n" +"GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" +msgstr "" + +#. (itstool) path: example/title +#: C/index.docbook:420 +msgid "Keep gtk-doc optional" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:421 +#, no-wrap +msgid "" +"\n" +"# check for gtk-doc\n" +"m4_ifdef([GTK_DOC_CHECK], [\n" +"GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" +"],[\n" +"AM_CONDITIONAL([ENABLE_GTK_DOC], false)\n" +"])\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:415 +msgid "" +"This will require all developers to have gtk-doc installed. If it is okay " +"for your project to have optional api-doc build setup, you can solve this as " +"below. Keep it as is, as gtkdocize is looking for GTK_DOC_CHECK at the start of a line. <_:example-1/>" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:432 +msgid "" +"The first argument is used to check for the gtkdocversion at configure time. " +"The 2nd, optional argument is used by gtkdocize. " +"The GTK_DOC_CHECK macro also adds several configure " +"switches:" +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:438 +msgid "--with-html-dir=PATH : path to installed docs" +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:439 +msgid "--enable-gtk-doc : use gtk-doc to build documentation [default=no]" +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:440 +msgid "" +"--enable-gtk-doc-html : build documentation in html format [default=yes]" +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:441 +msgid "--enable-gtk-doc-pdf : build documentation in pdf format [default=no]" +msgstr "" + +#. (itstool) path: important/para +#: C/index.docbook:445 +msgid "" +"GTK-Doc is disabled by default! Remember to pass the option to the next configure run. " +"Otherwise pregenerated documentation is installed (which makes sense for " +"users but not for developers)." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:453 +msgid "" +"Furthermore it is recommended that you have the following line inside you " +"configure.ac script. This allows " +"gtkdocize to automatically copy the macro " +"definition for GTK_DOC_CHECK to your project." +msgstr "" + +#. (itstool) path: example/title +#: C/index.docbook:461 +msgid "Preparation for gtkdocize" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:462 +#, no-wrap +msgid "" +"\n" +"AC_CONFIG_MACRO_DIR(m4)\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:467 +msgid "" +"After all changes to configure.ac are made, update the " +"configure file. This can be done by re-running " +"autoreconf -i or autogen.sh." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:475 +msgid "Integration with automake" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:477 +msgid "" +"First copy the Makefile.am from the examples sub directory of the gtkdoc-sources to your project's API documentation directory ( ./docs/reference/<package>). A local copy " +"should be available under e.g. /usr/share/doc/gtk-doc-tools/" +"examples/Makefile.am. If you have multiple doc-packages repeat " +"this for each one." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:488 +msgid "" +"The next step is to edit the settings inside the Makefile.am. All the settings have a comment above that describes their " +"purpose. Most settings are extra flags passed to the respective tools. Every " +"tool has a variable of the form . " +"All the tools support to list the supported " +"parameters." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:502 +msgid "Integration with autogen" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:504 +msgid "" +"Most projects will have an autogen.sh script to setup " +"the build infrastructure after a checkout from version control system (such " +"as cvs/svn/git). GTK-Doc comes with a tool called gtkdocize which can be used in such a script. It should be run before " +"autoheader, automake or autoconf." +msgstr "" + +#. (itstool) path: example/title +#: C/index.docbook:513 +msgid "Running gtkdocize from autogen.sh" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:514 +#, no-wrap +msgid "" +"\n" +"gtkdocize || exit 1\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:520 +msgid "" +"When running gtkdocize it copies gtk-" +"doc.make to your project root (or any directory specified by the " +" option). It also checks you configure script for " +"the GTK_DOC_CHECK invocation. This macro can be used to " +"pass extra parameters to gtkdocize." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:529 +msgid "" +"Historically GTK-Doc was generating template files where developers entered " +"the docs. This turned out to be not so good (e.g. the need for having " +"generated files under version control). Since GTK-Doc 1.9 the tools can get " +"all the information from source comments and thus the templates can be " +"avoided. We encourage people to keep documentation in the code. " +"gtkdocize supports now a option that chooses a makefile that skips tmpl usage totally. " +"Besides adding the option directly to the command invocation, they can be " +"added also to an environment variable called GTKDOCIZE_FLAGS or set as a 2nd parameter in GTK_DOC_CHECK macro in " +"the configure script. If you have never changed file in tmpl by hand and " +"migrating from older gtkdoc versions, please remove the directory (e.g. from " +"version control system)." +msgstr "" + +#. (itstool) path: sect1/title +#. (itstool) path: example/title +#: C/index.docbook:546 C/index.docbook:563 +msgid "Running the doc build" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:548 +msgid "" +"After the previous steps it's time to run the build. First we need to rerun " +"autogen.sh. If this script runs configure for you, then " +"give it the option. Otherwise manually run " +"configure with this option afterwards." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:555 +msgid "" +"The first make run generates several additional files in the doc-" +"directories. The important ones are: <package>.types, <package>-docs.xml (in the past ." +"sgml), <package>-sections.txt." +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:564 +#, no-wrap +msgid "" +"\n" +"./autogen.sh --enable-gtk-doc\n" +"make\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:570 +msgid "" +"Now you can point your browser to docs/reference/<package>/" +"index.html. Yes, it's a bit disappointing still. But hang-on, " +"during the next chapter we tell you how to fill the pages with life." +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:578 +msgid "Integration with version control systems" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:580 +msgid "" +"As a rule of the thumb, it's those files you edit, that should go under " +"version control. For typical projects it's these files: <" +"package>.types, <package>-docs.xml " +"(in the past .sgml), <package>-sections.txt, " +"Makefile.am" +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:591 +msgid "Integration with plain makefiles or other build systems" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:593 +msgid "" +"In the case one does not want to use automake and therefore gtk-" +"doc.mak one will need to call the gtkdoc tools in the right order " +"in own makefiles (or other build tools)." +msgstr "" + +#. (itstool) path: example/title +#: C/index.docbook:600 +msgid "Documentation build steps" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:601 +#, no-wrap +msgid "" +"\n" +"DOC_MODULE=meep\n" +"// sources have changed\n" +"gtkdoc-scan --module=$(DOC_MODULE) --source-dir=...\n" +"gtkdoc-scangobj --module=$(DOC_MODULE)\n" +"gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml\n" +"// xml files have changed\n" +"mkdir html\n" +"cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml\n" +"gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:615 +msgid "" +"One will need to look at the Makefile.am and " +"gtk-doc.mak to pick the extra options needed." +msgstr "" + +#. (itstool) path: chapter/title +#: C/index.docbook:624 +msgid "Documenting the code" +msgstr "" + +#. (itstool) path: chapter/para +#: C/index.docbook:626 +msgid "" +"GTK-Doc uses source code comment with a special syntax for code " +"documentation. Further it retrieves information about your project structure " +"from other sources. During the next section you will find all information " +"about the syntax of the comments." +msgstr "" + +#. (itstool) path: note/title +#: C/index.docbook:634 +msgid "Documentation placement" +msgstr "" + +#. (itstool) path: note/para +#: C/index.docbook:635 +msgid "" +"In the past most documentation had to be filled into files residing inside " +"the tmpl directory. This has the disadvantages that the " +"information is often not updated and also that the file tend to cause " +"conflicts with version control systems." +msgstr "" + +#. (itstool) path: note/para +#: C/index.docbook:641 +msgid "" +"The avoid the aforementioned problems we suggest putting the documentation " +"inside the sources. This manual will only describe this way of documenting " +"code." +msgstr "" + +#. (itstool) path: example/title +#: C/index.docbook:652 C/index.docbook:669 +msgid "GTK-Doc comment block" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:653 +#, no-wrap +msgid "" +"\n" +"#ifndef __GTK_DOC_IGNORE__\n" +"/* unparseable code here */\n" +"#endif\n" +msgstr "" + +#. (itstool) path: chapter/para +#: C/index.docbook:648 +msgid "" +"The scanner can handle the majority of C headers fine. In the case of " +"receiving warnings from the scanner that look like a special case, one can " +"hint GTK-Doc to skip over them. <_:example-1/>" +msgstr "" + +#. (itstool) path: sect1/title +#: C/index.docbook:664 +msgid "Documentation comments" +msgstr "" + +#. (itstool) path: example/programlisting +#: C/index.docbook:670 +#, no-wrap +msgid "" +"\n" +"/**\n" +" * identifier:\n" +" * documentation ...\n" +" */\n" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:666 +msgid "" +"A multiline comment that starts with an additional '*' marks a documentation " +"block that will be processed by the GTK-Doc tools. <_:example-1/>" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:679 +msgid "" +"The 'identifier' is one line with the name of the item the comment is " +"related to. The syntax differs a little depending on the item. (TODO add " +"table showing identifiers)" +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:685 +msgid "" +"The 'documentation' block is also different for each symbol type. Symbol " +"types that get parameters such as functions or macros have the parameter " +"description first followed by a blank line (just a '*'). Afterwards follows " +"the detailed description. All lines (outside program listings and CDATA " +"sections) just containing a ' *' (blank-asterisk) are converted to paragraph " +"breaks. If you don't want a paragraph break, change that into ' * ' (blank-" +"asterisk-blank-blank). This is useful in preformatted text (code listings)." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:702 +msgid "" +"What it is: The name for a class or function can sometimes be misleading for " +"people coming from a different background." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:708 +msgid "" +"What it does: Tell about common uses. Put it in relation with the other API." +msgstr "" + +#. (itstool) path: tip/para +#: C/index.docbook:698 +msgid "When documenting code, describe two aspects: <_:itemizedlist-1/>" +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:723 +msgid "Use function() to refer to functions or macros which take arguments." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:728 +msgid "" +"Use @param to refer to parameters. Also use this when referring to " +"parameters of other functions, related to the one being described." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:734 +msgid "Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:739 +msgid "" +"Use #symbol to refer to other types of symbol, e.g. structs and enums and " +"macros which don't take arguments." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:745 +msgid "Use #Object::signal to refer to a GObject signal." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:750 +msgid "Use #Object:property to refer to a GObject property." +msgstr "" + +#. (itstool) path: listitem/para +#: C/index.docbook:755 +msgid "" +"Use #Struct.field to refer to a field inside a structure and #GObjectClass." +"foo_bar() to refer to a vmethod." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:717 +msgid "" +"One advantage of hyper-text over plain-text is the ability to have links in " +"the document. Writing the correct markup for a link can be tedious though. " +"GTK-Doc comes to help by providing several useful abbreviations. <_:" +"itemizedlist-1/>" +msgstr "" + +#. (itstool) path: tip/para +#: C/index.docbook:764 +msgid "" +"If you need to use the special characters '<', '>', '()', '@', '%', or " +"'#' in your documentation without GTK-Doc changing them you can use the XML " +"entities \"&lt;\", \"&gt;\", \"&lpar;\", \"&rpar;\", \"&" +"commat;\", \"&percnt;\" and \"&num;\" respectively or escape them " +"with a backslash '\\'." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:773 +msgid "" +"DocBook can do more than just links. One can also have lists, examples, " +"headings, and images. As of version 1.20, the preferred way is to use a " +"subset of the basic text formatting syntax called Markdown. On older GTK-Doc " +"versions any documentation that includes Markdown will be rendered as is. " +"For example, list items will appear as lines starting with a dash." +msgstr "" + +#. (itstool) path: sect1/para +#: C/index.docbook:784 +msgid "" +"In older GTK-Doc releases, if you need support for additional formatting, " +"you would need to enable the usage of docbook SGML/XML tags inside doc-" +"comments by putting or + + + + + To include example code: + + + Using a GHashTable. + + ... + + +]]> + + or possibly this, for very short code fragments which don't need a title: + + + + ... + + +]]> + + For the latter GTK-Doc also supports an abbreviation: + + + + + To include bulleted lists: + + + + + ... + + + + + ... + + + +]]> + + + + + To include a note which stands out from the text: + + + + Make sure you free the data after use. + + +]]> + + + + + To refer to a type: + + unsigned char +]]> + + + + + To refer to an external structure (not one described in the GTK docs): + + XFontStruct +]]> + + + + + To refer to a field of a structure: + + len +]]> + + + + + To refer to a class name, we could possibly use: + + GtkWidget +]]> + + but you'll probably be using #GtkWidget instead (to automatically create + a link to the GtkWidget page - see the abbreviations). + + + + To emphasize text: + + This is important +]]> + + + + + For filenames use: + + /home/user/documents +]]> + + + + + To refer to keys use: + + ControlL +]]> + + + + + + + + Filling the extra files + + + There are a couple of extra files, that need to be maintained along with + the inline source code comments: + <package>.types, + <package>-docs.xml (in the past .sgml), + <package>-sections.txt. + + + + Editing the types file + + + If your library or application includes GObjects, you want + their signals, arguments/parameters and position in the hierarchy to be + shown in the documentation. All you need to do, is to list the + xxx_get_type functions together with their include + inside the <package>.types file. + + + + Example types file snippet + + +gtk_accel_label_get_type +gtk_adjustment_get_type +gtk_alignment_get_type +gtk_arrow_get_type +]]> + + + + + Since GTK-Doc 1.8 gtkdoc-scan can generate this list for you. + Just add "--rebuild-types" to SCAN_OPTIONS in Makefile.am. If you + use this approach you should not dist the types file nor have it under version control. + + + + + + Editing the master document + + + GTK-Doc produces documentation in DocBook SGML/XML. When processing the + inline source comments, the GTK-Doc tools generate one documentation + page per class or module as a separate file. The master document + includes them and place them in an order. + + + + While GTK-Doc creates a template master document for you, later run will + not touch it again. This means that one can freely structure the + documentation. That includes grouping pages and adding extra pages. + GTK-Doc has now a test suite, where also the master-document is recreated from scratch. + Its a good idea to look at this from time to time to see if there are some new goodies + introduced there. + + + + + Do not create tutorials as extra documents. Just write extra chapters. + The benefit of directly embedding the tutorial for your library into + the API documentation is that it is easy to link for the tutorial to + symbol documentation. Apart chances are higher that the tutorial gets + updates along with the library. + + + + + So what are the things to change inside the master document? For a start + is only a little. There are some placeholders (text in square brackets) + there which you should take care of. + + + + Master document header + + MODULENAME Reference Manual + + for MODULENAME [VERSION] + The latest version of this documentation can be found on-line at + http://[SERVER]/MODULENAME/. + + + + + [Insert title here] +]]> + + + + + + + Editing the section file + + + The section file is used to organise the documentation output by + GTK-Doc. Here one specifies which symbol belongs to which module or + class and control the visibility (public or private). + + + + The section file is a plain text file with XML-like syntax (using tags). + Blank lines are ignored and lines starting with a '#' are treated as + comment lines. + + + + The <FILE> ... </FILE> tag is used to specify the file name, + without any suffix. For example, using '<FILE>gnome-config</FILE>' + will result in the section declarations being output in the template + file tmpl/gnome-config.sgml, which will be + converted into the DocBook SGML/XML file sgml/gnome-config.sgml + or the DocBook XML file xml/gnome-config.xml. + (The name of the HTML file is based on the module name and the section + title, or for GObjects it is based on the GObjects class name converted + to lower case). + + + + The <TITLE> ... </TITLE> tag is used to specify the title of + the section. It is only useful before the templates (if used) are + initially created, since the title set in the template file overrides + this. Also if one uses SECTION comment in the sources, this is obsolete. + + + + You can group items in the section by using the <SUBSECTION> tag. + Currently it outputs a blank line between subsections in the synopsis + section. + You can also use <SUBSECTION Standard> for standard GObject + declarations (e.g. the functions like g_object_get_type and macros like + G_OBJECT(), G_IS_OBJECT() etc.). + Currently these are left out of the documentation. + You can also use <SUBSECTION Private> for private declarations + which will not be output (it is a handy way to avoid warning messages + about unused declarations). + If your library contains private types which you don't want to appear in + the object hierarchy and the list of implemented or required interfaces, + add them to a Private subsection. + Whether you would place GObject and GObjectClass like structs in public + or Standard section depends if they have public entries (variables, + vmethods). + + + + You can also use <INCLUDE> ... </INCLUDE> to specify the + #include files which are shown in the synopsis sections. + It contains a comma-separate list of #include files, without the angle + brackets. If you set it outside of any sections, it acts for all + sections until the end of the file. If you set it within a section, it + only applies to that section. + + + + + + + + Controlling the result + + + A GTK-Doc run generates report files inside the documentation directory. + The generated files are named: + <package>-undocumented.txt, + <package>-undeclared.txt and + <package>-unused.txt. + All those are plain text files that can be viewed and postprocessed easily. + + + + The <package>-undocumented.txt file starts with + the documentation coverage summary. Below are two sections divided by + blank lines. The first section lists undocumented or incomplete symbols. + The second section does the same for section docs. Incomplete entries are + those, which have documentation, but where e.g. a new parameter has been + added. + + + + The <package>-undeclared.txt file lists symbols + given in the <package>-sections.txt but not + found in the sources. Check if they have been removed or if they are + misspelled. + + + + The <package>-unused.txt file lists symbol + names, where the GTK-Doc scanner has found documentation, but does not + know where to put it. This means that the symbol has not yet been added to + the <package>-sections.txt file. + + + + + Enable or add the line in Makefile.am. + If at least GTK-Doc 1.9 is installed, this will run sanity checks during + make check run. + + + + + One can also look at the files produced by the source code scanner: + <package>-decl-list.txt and + <package>-decl.txt. The first one can be + compared with the section file if that is manually maintained. The second + lists all declarations from the headers. If a symbol is missing one could + check if this file contains it. + + + + If the project is GObject based, one can also look into the files produced + by the object scanner: + <package>.args.txt, + <package>.hierarchy.txt, + <package>.interfaces.txt, + <package>.prerequisites.txt and + <package>.signals.txt. If there are missing + symbols in any of those, one can ask GTK-Doc to keep the intermediate + scanner file for further analysis, by running it as + GTK_DOC_KEEP_INTERMEDIATE=1 make. + + + + + Modernizing the documentation + + + GTK-Doc has been around for quite some time. In this section we list new + features together with the version since when it is available. + + + + GTK-Doc 1.9 + + + When using xml instead of sgml, one can actually name the master + document <package>-docs.xml. + + + + This version supports + in Makefile.am. When this is enabled, the + <package>-sections.txt is autogenerated and + can be removed from the vcs. This only works nicely for projects that + have a very regular structure (e.g. each .{c,h} pair will create new + section). If one organize a project close to that updating a manually + maintained section file can be as simple as running + meld <package>-decl-list.txt <package>-sections.txt. + + + + Version 1.8 already introduced the syntax for documenting sections in + the sources instead of the separate files under tmpl. + This version adds options to switch the whole doc module to not use the + extra tmpl build step at all, by using + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. + + + + + GTK-Doc 1.10 + + + This version supports in + Makefile.am. When this is enabled, the + <package>.types is autogenerated and can be + removed from the vcs. When using this feature it is important to also + setup the IGNORE_HFILES in + Makefile.am for code that is build conditionally. + + + + + GTK-Doc 1.16 + + + This version includes a new tool called gtkdoc-check. This tool can run + a set of sanity checks on your documentation. It is enabled by adding + these lines to the end of Makefile.am. + Enable gtkdoc-check + + + + + + + GTK-Doc 1.20 + + + Version 1.18 brought some initial markdown support. Using markdown in + doc comments is less intrusive than writing docbook xml. This version + improves a lot on this and add a lot more styles. The section that + explains the comment syntax + has all the details. + + + + + + Documentando outras interfaces + + + So far we have been using GTK-Doc to document the API of code. The next + sections contain suggestions how the tools can be used to document other + interfaces too. + + + + Command line options and man pages + + + As one can generate man pages for a docbook refentry as well, it sounds + like a good idea to use it for that purpose. This way the interface is + part of the reference and one gets the man-page for free. + + + + Documente a ferramenta + + + Create one refentry file per tool. Following + our example we would call it + meep/docs/reference/meeper/meep.xml. For the xml + tags that should be used and can look at generated file in the xml + subdirectory as well as examples e.g. in glib. + + + + + Adding the extra configure check + + + Extra configure checks + + + + + + + Adding the extra makefile rules + + + Extra configure checks + + + + + + + + Intefaces de DBus + + + (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, +http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) + + + + + + + Preguntas frecuentes + + + + Pregunta + Resposta + + Non hai herdanza de clases. + + The objects xxx_get_type() function has not been + entered into the <package>.types file. + + + + Aínda non hai herdanza de clases. + + Missing or wrong naming in <package>-sections.txt + file (see explanation). + + + + Redemo, aínda non hai herdanza de clase. + + Is the object name (name of the instance struct, e.g. GtkWidget) + part of the normal section (don't put this into Standard or Private + subsections). + + + + No symbol index. + + Does the <package>-docs.{xml,sgml} contain a + index that xi:includes the generated index? + + + + Symbols are not linked to their doc-section. + + Is the doc-comment using the correct markup (added #,% or ())? + Check if the gtkdoc-fixxref warns about unresolvable xrefs. + + + + A new class does not appear in the docs. + + Is the new page xi:included from + <package>-docs.{xml,sgml}. + + + + A new symbol does not appear in the docs. + + Is the doc-comment properly formatted. Check for spelling mistakes in + the begin of the comment. Check if the gtkdoc-fixxref warns about + unresolvable xrefs. Check if the symbol is correctly listed in the + <package>-sections.txt in a public subsection. + + + + A type is missing from the class hierarchy. + + If the type is listed in <package>.hierarchy + but not in xml/tree_index.sgml then double check + that the type is correctly placed in the <package>-sections.txt. + If the type instance (e.g. GtkWidget) is not listed or + incidentally marked private it will not be shown. + + + + I get foldoc links for all gobject annotations. + + Check that xml/annotation-glossary.xml is + xi:included from <package>-docs.{xml,sgml}. + + + + + + Parameter described in source code comment block but does not exist + Check if the prototype in the header has different parameter names as in the source. + + + + + multiple "IDs" for constraint linkend: XYZ + Symbol XYZ appears twice in <package>-sections.txt file. + + + Element typename in namespace '' encountered in para, but no template matches. + + + + + + + Tools related to gtk-doc + + + GtkDocPlugin - a Trac GTK-Doc + integration plugin, that adds API docs to a trac site and integrates with + the trac search. + + + Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since + tags in the API to determine the minimum required version. + + + + + + + + + + + Version 1.1, March 2000 + + + 2000Free Software Foundation, Inc. + + + +
Free Software Foundation, Inc. 51 Franklin Street, + Suite 330, Boston, MA + 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + + + + GNU Free Documentation License + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or + other written document free in the sense of + freedom: to assure everyone the effective freedom to copy and + redistribute it, with or without modifying it, either + commercially or noncommercially. Secondarily, this License + preserves for the author and publisher a way to get credit for + their work, while not being considered responsible for + modifications made by others. + + + + This License is a kind of copyleft, which means + that derivative works of the document must themselves be free in + the same sense. It complements the GNU General Public License, + which is a copyleft license designed for free software. + + + + We have designed this License in order to use it for manuals for + free software, because free software needs free documentation: a + free program should come with manuals providing the same + freedoms that the software does. But this License is not limited + to software manuals; it can be used for any textual work, + regardless of subject matter or whether it is published as a + printed book. We recommend this License principally for works + whose purpose is instruction or reference. + + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work that contains a + notice placed by the copyright holder saying it can be + distributed under the terms of this License. The + Document, below, refers to any such manual or + work. Any member of the public is a licensee, and is addressed + as you. + + + + A Modified Version of the Document means any work + containing the Document or a portion of it, either copied + verbatim, or with modifications and/or translated into another + language. + + + + A Secondary Section is a named appendix or a + front-matter section of the Document that deals exclusively + with the relationship of the publishers or authors of the + Document to the Document's overall subject (or to related + matters) and contains nothing that could fall directly within + that overall subject. (For example, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of + legal, commercial, philosophical, ethical or political position + regarding them. + + + + The Invariant Sections are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the + notice that says that the Document is released under this + License. + + + + The Cover Texts are certain short passages of + text that are listed, as Front-Cover Texts or Back-Cover Texts, + in the notice that says that the Document is released under this + License. + + + + A Transparent copy of the Document means a machine-readable + copy, represented in a format whose specification is available + to the general public, whose contents can be viewed and edited + directly and straightforwardly with generic text editors or (for + images composed of pixels) generic paint programs or (for + drawings) some widely available drawing editor, and that is + suitable for input to text formatters or for automatic + translation to a variety of formats suitable for input to text + formatters. A copy made in an otherwise Transparent file format + whose markup has been designed to thwart or discourage + subsequent modification by readers is not Transparent. A copy + that is not Transparent is called + Opaque. + + + + Examples of suitable formats for Transparent copies include + plain ASCII without markup, Texinfo input format, LaTeX input + format, SGML or XML using a publicly available DTD, and + standard-conforming simple HTML designed for human + modification. Opaque formats include PostScript, PDF, + proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD + and/or processing tools are not generally available, and the + machine-generated HTML produced by some word processors for + output purposes only. + + + + The Title Page means, for a printed book, the + title page itself, plus such following pages as are needed to + hold, legibly, the material this License requires to appear in + the title page. For works in formats which do not have any title + page as such, Title Page means the text near the + most prominent appearance of the work's title, preceding the + beginning of the body of the text. + + + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License + applies to the Document are reproduced in all copies, and that + you add no other conditions whatsoever to those of this + License. You may not use technical measures to obstruct or + control the reading or further copying of the copies you make or + distribute. However, you may accept compensation in exchange for + copies. If you distribute a large enough number of copies you + must also follow the conditions in section 3. + + + + You may also lend copies, under the same conditions stated + above, and you may publicly display copies. + + + + + 3. COPIANDO EN CANTIDADE + + If you publish printed copies of the Document numbering more than 100, + and the Document's license notice requires Cover Texts, you must enclose + the copies in covers that carry, clearly and legibly, all these + Cover Texts: Front-Cover Texts on the front cover, and + Back-Cover Texts on the back cover. Both covers must also + clearly and legibly identify you as the publisher of these + copies. The front cover must present the full title with all + words of the title equally prominent and visible. You may add + other material on the covers in addition. Copying with changes + limited to the covers, as long as they preserve the title of the + Document and satisfy these + conditions, can be treated as verbatim copying in other + respects. + + + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto + adjacent pages. + + + + If you publish or distribute Opaque copies of the Document numbering more than 100, + you must either include a machine-readable Transparent copy along with + each Opaque copy, or state in or with each Opaque copy a + publicly-accessible computer-network location containing a + complete Transparent copy of the Document, free of added + material, which the general network-using public has access to + download anonymously at no charge using public-standard network + protocols. If you use the latter option, you must take + reasonably prudent steps, when you begin distribution of Opaque + copies in quantity, to ensure that this Transparent copy will + remain thus accessible at the stated location until at least one + year after the last time you distribute an Opaque copy (directly + or through your agents or retailers) of that edition to the + public. + + + + It is requested, but not required, that you contact the authors + of the Document well before + redistributing any large number of copies, to give them a chance + to provide you with an updated version of the Document. + + + + + 4. MODIFICACIÓNS + + You may copy and distribute a Modified Version of the Document under the conditions of + sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the + Modified Version filling the role of the Document, thus + licensing distribution and modification of the Modified Version + to whoever possesses a copy of it. In addition, you must do + these things in the Modified Version: + + + + + + A + + Use in the Title + Page (and on the covers, if any) a title distinct + from that of the Document, and from those of + previous versions (which should, if there were any, be + listed in the History section of the Document). You may + use the same title as a previous version if the original + publisher of that version gives permission. + + + + + + + B + + List on the Title + Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the + Modified Version, + together with at least five of the principal authors of + the Document (all of + its principal authors, if it has less than five). + + + + + + + C + + State on the Title + Page the name of the publisher of the Modified Version, as the + publisher. + + + + + + + D + + Preserve all the copyright notices of the Document. + + + + + + + E + + Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + + + + + + + F + + Include, immediately after the copyright notices, a + license notice giving the public permission to use the + Modified Version under + the terms of this License, in the form shown in the + Addendum below. + + + + + + + G + + Preserve in that license notice the full lists of Invariant Sections and + required Cover + Texts given in the Document's license notice. + + + + + + + H + + Include an unaltered copy of this License. + + + + + + + I + + Preserve the section entitled History, and + its title, and add to it an item stating at least the + title, year, new authors, and publisher of the Modified Version as given on + the Title Page. If + there is no section entitled History in the + Document, create one + stating the title, year, authors, and publisher of the + Document as given on its Title Page, then add an item + describing the Modified Version as stated in the previous + sentence. + + + + + + + J + + Preserve the network location, if any, given in the Document for public access + to a Transparent + copy of the Document, and likewise the network locations + given in the Document for previous versions it was based + on. These may be placed in the History + section. You may omit a network location for a work that + was published at least four years before the Document + itself, or if the original publisher of the version it + refers to gives permission. + + + + + + + K + + In any section entitled Acknowledgements or + Dedications, preserve the section's title, + and preserve in the section all the substance and tone of + each of the contributor acknowledgements and/or + dedications given therein. + + + + + + + L + + Preserve all the Invariant + Sections of the Document, unaltered in their + text and in their titles. Section numbers or the + equivalent are not considered part of the section titles. + + + + + + + M + + Delete any section entitled + Endorsements. Such a section may not be + included in the Modified + Version. + + + + + + + N + + Do not retitle any existing section as + Endorsements or to conflict in title with + any Invariant + Section. + + + + + + + If the Modified Version + includes new front-matter sections or appendices that qualify as + Secondary Sections and + contain no material copied from the Document, you may at your + option designate some or all of these sections as invariant. To + do this, add their titles to the list of Invariant Sections in the + Modified Version's license notice. These titles must be + distinct from any other section titles. + + + + You may add a section entitled Endorsements, + provided it contains nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text + has been approved by an organization as the authoritative + definition of a standard. + + + + You may add a passage of up to five words as a Front-Cover Text, and a passage + of up to 25 words as a Back-Cover Text, to the end of + the list of Cover Texts + in the Modified Version. + Only one passage of Front-Cover Text and one of Back-Cover Text + may be added by (or through arrangements made by) any one + entity. If the Document + already includes a cover text for the same cover, previously + added by you or by arrangement made by the same entity you are + acting on behalf of, you may not add another; but you may + replace the old one, on explicit permission from the previous + publisher that added the old one. + + + + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to + assert or imply endorsement of any Modified Version . + + + + + 5. COMBINING DOCUMENTS + + You may combine the Document + with other documents released under this License, under the + terms defined in section 4 + above for modified versions, provided that you include in the + combination all of the Invariant + Sections of all of the original documents, unmodified, + and list them all as Invariant Sections of your combined work in + its license notice. + + + + The combined work need only contain one copy of this License, + and multiple identical Invariant + Sections may be replaced with a single copy. If there are + multiple Invariant Sections with the same name but different + contents, make the title of each such section unique by adding + at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique + number. Make the same adjustment to the section titles in the + list of Invariant Sections in the license notice of the combined + work. + + + + In the combination, you must combine any sections entitled + History in the various original documents, + forming one section entitled History; likewise + combine any sections entitled Acknowledgements, + and any sections entitled Dedications. You must + delete all sections entitled Endorsements. + + + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies + of this License in the various documents with a single copy that + is included in the collection, provided that you follow the + rules of this License for verbatim copying of each of the + documents in all other respects. + + + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + + + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with + other separate and independent documents or works, in or on a + volume of a storage or distribution medium, does not as a whole + count as a Modified Version + of the Document, provided no compilation copyright is claimed + for the compilation. Such a compilation is called an + aggregate, and this License does not apply to the + other self-contained works thus compiled with the Document , on + account of their being thus compiled, if they are not themselves + derivative works of the Document. If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one + quarter of the entire aggregate, the Document's Cover Texts may + be placed on covers that surround only the Document within the + aggregate. Otherwise they must appear on covers around the whole + aggregate. + + + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. Replacing Invariant Sections with + translations requires special permission from their copyright + holders, but you may include translations of some or all + Invariant Sections in addition to the original versions of these + Invariant Sections. You may include a translation of this + License provided that you also include the original English + version of this License. In case of a disagreement between the + translation and the original English version of this License, + the original English version will prevail. + + + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except as expressly + provided for under this License. Any other attempt to copy, + modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software + Foundation may publish new, revised versions of the GNU + Free Documentation License from time to time. Such new versions + will be similar in spirit to the present version, but may differ + in detail to address new problems or concerns. See http://www.gnu.org/copyleft/. + + + + Each version of the License is given a distinguishing version + number. If the Document + specifies that a particular numbered version of this License + or any later version applies to it, you have the + option of following the terms and conditions either of that + specified version or of any later version that has been + published (not as a draft) by the Free Software Foundation. If + the Document does not specify a version number of this License, + you may choose any version ever published (not as a draft) by + the Free Software Foundation. + + + + + Addendum + + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + + +
+ + Copyright YEAR YOUR NAME. + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License, Version 1.1 or any later version published by the + Free Software Foundation; with the Invariant Sections being LIST + THEIR TITLES, with the Front-Cover Texts being LIST, + and with the Back-Cover + Texts being LIST. A copy of the license is included in + the section entitled GNU Free Documentation + License. + +
+ + + If you have no Invariant + Sections, write with no Invariant Sections + instead of saying which ones are invariant. If you have no + Front-Cover Texts, write + no Front-Cover Texts instead of + Front-Cover Texts being LIST; likewise for Back-Cover Texts. + + + + If your document contains nontrivial examples of program code, + we recommend releasing these examples in parallel under your + choice of free software license, such as the GNU General Public + License, to permit their use in free software. + + + + + + + + + + + + diff --git a/help/manual/gu/fdl-appendix.xml b/help/manual/gu/fdl-appendix.xml index cbd19b0..2f3276f 100644 --- a/help/manual/gu/fdl-appendix.xml +++ b/help/manual/gu/fdl-appendix.xml @@ -492,7 +492,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/gu/index.docbook b/help/manual/gu/index.docbook index 9b690ae..0893cb1 100644 --- a/help/manual/gu/index.docbook +++ b/help/manual/gu/index.docbook @@ -68,11 +68,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -494,12 +500,17 @@ make આવૃત્તિ નિયંત્રણ સિસ્ટમો સાથે એકત્રિકરણ - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -517,9 +528,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -564,7 +575,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -691,12 +711,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -747,7 +772,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - પહેલાનાં GTK-Doc માં પહેલેથી જણાવેલ પ્રમાણે સાર્વજનિક API દસ્તાવેજીકરણ માટે છે. છતાં એક એ સ્થિર સંકેતો માટે દસ્તાવેજીકરણ ને લખી શકતુ નથી. તેમ છતાં તે પેલાં સંકેતો પર ટિપ્પણી કરવા માટે સારુ છે. આ તમારાં કોડને સમજવા માટે બીજાને મદદ કરે છે. માટે આપણે સામાન્ય ટિપ્પણીઓની મદદથી આ ટિપ્પણી એ અગ્રહણીય કરેલ છે (પહેલાં વાક્યમાં બીજા '*' વગર). જો પછી વિધેયને સાર્વજનિક બનાવવાની જરૂર છે, ટિપ્પણી બ્લોકમાં બીજા '*' ઉમેરવા માટે બધાને કરવાની જરૂર છે અને ફાઇલ વિભાગોની અંદર જમણી જગ્યા પર સંકેત નામને દાખલ કરો. + પહેલાનાં GTK-Doc માં પહેલેથી જણાવેલ પ્રમાણે સાર્વજનિક API દસ્તાવેજીકરણ માટે છે. છતાં એક એ સ્થિર સંકેતો માટે દસ્તાવેજીકરણ ને લખી શકતુ નથી. તેમ છતાં તે પેલાં સંકેતો પર ટિપ્પણી કરવા માટે સારુ છે. આ તમારાં કોડને સમજવા માટે બીજાને મદદ કરે છે. માટે આપણે સામાન્ય ટિપ્પણીઓની મદદથી આ ટિપ્પણી એ અગ્રહણીય કરેલ છે (પહેલાં વાક્યમાં બીજા '*' વગર). જો પછી વિધેયને સાર્વજનિક બનાવવાની જરૂર છે, ટિપ્પણી બ્લોકમાં બીજા '*' ઉમેરવા માટે બધાને કરવાની જરૂર છે અને ફાઇલ વિભાગોની અંદર જમણી જગ્યા પર સંકેત નામને દાખલ કરો. @@ -933,8 +958,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : સ્થિરતા જાણકારી) - + (FIXME : સ્થિરતા જાણકારી) + સામાન્ય ટેગ + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + વિધેય ટિપ્પણી બ્લોક @@ -982,13 +1039,6 @@ foo_get_bar(Foo *foo) Gtk-doc એ '_' સાથે શરૂ થતા બધા સંકેતો (મેક્રો, વિધેયો) ને ખાનગી ધારે છે. તેઓ સ્થિર વિધેયો જેવું વર્ણતૂક કરે છે. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - વિધેય ટિપ્પણી બ્લોક tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1750,7 +1802,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2287,7 +2339,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/pt_BR/fdl-appendix.xml b/help/manual/pt_BR/fdl-appendix.xml index 83fbe1c..b1549a5 100644 --- a/help/manual/pt_BR/fdl-appendix.xml +++ b/help/manual/pt_BR/fdl-appendix.xml @@ -192,7 +192,13 @@ 6. COLEÇÕES DE DOCUMENTOS Você pode fazer uma coleção que consiste do Documento e outros documentos publicados sob esta Licença, e substituir as cópias individuais desta Licença, nos vários documentos, por uma única cópia a ser incluída na coleção, desde que você siga as regras desta Licença para cópias literais de cada documento em todos os outros aspectos. - Você pode extrair um único documento desta coleção, e distribuí-lo individualmente sob esta Licença, desde que você insira uma cópia desta Licença no documento extraído, e siga esta Licença em todos os outros aspectos com relação à cópia literal do documento. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/pt_BR/index.docbook b/help/manual/pt_BR/index.docbook index bcfad54..09b4eec 100644 --- a/help/manual/pt_BR/index.docbook +++ b/help/manual/pt_BR/index.docbook @@ -34,7 +34,8 @@ - 1.20.1 16 Fev 2014 ss versão de desenvolvimento + 1.21.1 18 Jul 2014 ss versão de desenvolvimento + 1.21 17 Jul 2014 ss correção de erros, desativadas funcionalidades obsoletas 1.20 14 Fev 2014 ss correção de erros, suporte a markdown, melhorias no estilo 1.19 05 Jun 2013 ss correção de erros 1.18 14 Set 2011 ss correção de erros, aceleração, suporte a markdown @@ -285,7 +286,19 @@ make Integração com sistemas de controle de versão - Como uma regra de ouro, são aqueles arquivos que você edita que deveriam entrar no controle de versão. Para projetos normais, esses são os arquivos: <pacote>.types, <pacote>-docs.xml (no passado, .sgml), <pacote>-sections.txt, Makefile.am + + As a rule of thumb, it's the files you edit which should go under + version control. For typical projects it's these files: + <package>.types, + <package>-docs.xml (in the past .sgml), + <package>-sections.txt, + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. + @@ -295,17 +308,17 @@ make Etapas de compilação da documentação - + gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml -// arquivos xml foram alterados +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= +// xml files have changed mkdir html -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml +cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - +]]> @@ -333,6 +346,15 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -392,6 +414,12 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html DocBook pode fazer mais do que apenas links. Ele também pode ter listas, exemplos, títulos e imagens. A partir da versão 1.20, a forma preferível é usar um subconjunto de sintaxe de formatação de texto básica chamada Markdown. Em versões mais antigas do GTK-Doc, qualquer documentação que inclui Markdown será renderizada como está. Por exemplo, itens de lista aparecerão como linhas começando com um traço. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + Em versões mais antigas do GTK-Doc, se você precisasse de suporte para formatação adicional, você precisaria de habilitar o uso de tags de SGML/XML de docbook dentro de comentários de documentação colocando ou na variável MKDB_OPTIONS dentro de Makefile.am. @@ -438,7 +466,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html Mais exemplos do quais tags de markdown tags tem suporte pode ser encontrado na Referência de sintaxe de markdown de documentação. - Como já mencionado anteriormente, GTK-Doc serve para documentar API pública. Portanto, não é possível escrever documentação para símbolos estáticos. Não obstante, é bom comentar estes símbolos também. Isso ajuda outros a entender seu código. Portanto, é recomendado comentá-los usando comentários normais (sem o segundo "*" na primeira linha). Se, posteriormente, a função precisar ser publicada, tudo que precisa ser feito é adicionar outro "*" no bloco de comentário e inserir o nome do símbolo no lugar correto do arquivo e seções. + Como já mencionado anteriormente, GTK-Doc serve para documentar API pública. Portanto, não é possível escrever documentação para símbolos estáticos. Não obstante, é bom comentar estes símbolos também. Isso ajuda outros a entender seu código. Portanto, é recomendado comentá-los usando comentários normais (sem o segundo "*" na primeira linha). Se, posteriormente, a função precisar ser publicada, tudo que precisa ser feito é adicionar outro "*" no bloco de comentário e inserir o nome do símbolo no lugar correto do arquivo e seções. @@ -558,8 +586,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (CORRIJA-ME : Informação sobre estabilidade) - + (CORRIJA-ME : Informação sobre estabilidade) + Tags gerais /** @@ -581,6 +609,38 @@ foo_get_bar(Foo *foo) + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Bloco de comentário de função Por favor, lembre-se de: @@ -597,8 +657,6 @@ foo_get_bar(Foo *foo) Gtk-doc presume que todos os símbolos (macros, funções) começando com "_" são privadas. Elas são tratadas como funções estáticas. - Também, dê uma olhada nas tags de anotação do GObject Introspection: http://live.gnome.org/GObjectIntrospection/Annotations - Bloco de comentário de função /** @@ -948,7 +1006,15 @@ gtk_arrow_get_type Essa versão provê suporte em Makefile.am. Quando esta opção está habilitada, o <package>-sections.txt é auto-gerado e pode ser removido a partir do VCS. Isso só funciona corretamente para projetos que têm uma estrutura muito regular (ex.: cada par .{c,h} vai criar uma nova seção). Se uma pessoa organiza um projeto próximo a isso atualizando um arquivo de seção mantido manualmente pode ser tão simples quanto executando meld <package>-decl-list.txt <package>-sections.txt. - A versão 1.8 já introduziu a sintaxe para documentação seções nos fontes em vez dos arquivos separados sob tmpl. Essa versão adiciona opções para alternar todo o módulo de documentação para não usar a etapa de compilação extra do tmpl, usando no configure.ac. + + Version 1.8 already introduced the syntax for documenting sections in + the sources instead of the separate files under tmpl. + This version adds options to switch the whole doc module to not use the + extra tmpl build step at all, by using + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. + @@ -1084,7 +1150,13 @@ EXTRA_DIST += meep.xml Um tipo está faltando da hierarquia de classe. - Se o tipo está listado no <pacote>.hierarchy, mas não em xml/tree_index.sgml, então certifique-se de que o tipo está colocado corretamente no <pacote>-sections.txt. Se a instância do tipo (ex.: GtkWidget) não está listada ou incidentalmente marcada como privada, ela não será mostrada. + + If the type is listed in <package>.hierarchy + but not in xml/tree_index.sgml then double check + that the type is correctly placed in the <package>-sections.txt. + If the type instance (e.g. GtkWidget) is not listed or + incidentally marked private it will not be shown. + Obtenho links de seguimento de documentos para todas as anotações gobject. @@ -1310,7 +1382,13 @@ EXTRA_DIST += meep.xml 6. COLEÇÕES DE DOCUMENTOS Você pode fazer uma coleção que consiste do Documento e outros documentos publicados sob esta Licença, e substituir as cópias individuais desta Licença, nos vários documentos, por uma única cópia a ser incluída na coleção, desde que você siga as regras desta Licença para cópias literais de cada documento em todos os outros aspectos. - Você pode extrair um único documento desta coleção, e distribuí-lo individualmente sob esta Licença, desde que você insira uma cópia desta Licença no documento extraído, e siga esta Licença em todos os outros aspectos com relação à cópia literal do documento. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/pt_BR/pt_BR.po b/help/manual/pt_BR/pt_BR.po index 58e81d8..3aa172f 100644 --- a/help/manual/pt_BR/pt_BR.po +++ b/help/manual/pt_BR/pt_BR.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: gtk-doc help\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gtk-doc&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-04-10 09:36+0000\n" -"PO-Revision-Date: 2014-04-11 02:48-0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-" +"doc&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-07-18 07:42+0000\n" +"PO-Revision-Date: 2014-07-20 15:02-0300\n" "Last-Translator: Rafael Ferreira \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: Poedit 1.6.5\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" @@ -126,15 +126,26 @@ msgstr "" #. (itstool) path: revhistory/revision #: C/index.docbook:83 msgid "" -"1.20.1 16 Feb 2014 ss1.21.1 18 Jul 2014 ss development version" msgstr "" -"1.20.1 16 Fev 2014 ss1.21.1 18 Jul 2014 ss versão de desenvolvimento" #. (itstool) path: revhistory/revision #: C/index.docbook:89 msgid "" +"1.21 17 Jul 2014 ss bug fixes, dropping deprecated features" +msgstr "" +"1.21 17 Jul 2014 ss correção de erros, desativadas funcionalidades " +"obsoletas" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:95 +msgid "" "1.20 16 Feb 2014 ss bug fixes, markdown support, style improvements" @@ -144,7 +155,7 @@ msgstr "" "no estilo" #. (itstool) path: revhistory/revision -#: C/index.docbook:95 +#: C/index.docbook:101 msgid "" "1.19 05 Jun 2013 ss bug fixes" @@ -153,7 +164,7 @@ msgstr "" "authorinitials> correção de erros" #. (itstool) path: revhistory/revision -#: C/index.docbook:101 +#: C/index.docbook:107 msgid "" "1.18 14 Sep 2011 ss bug fixes, speedups, markdown support" @@ -163,7 +174,7 @@ msgstr "" "markdown" #. (itstool) path: revhistory/revision -#: C/index.docbook:107 +#: C/index.docbook:113 msgid "" "1.17 26 Feb 2011 sk urgent bug fix update" @@ -173,7 +184,7 @@ msgstr "" "revremark>" #. (itstool) path: revhistory/revision -#: C/index.docbook:113 +#: C/index.docbook:119 msgid "" "1.16 14 Jan 2011 sk bugfixes, layout improvements" @@ -182,7 +193,7 @@ msgstr "" "authorinitials> correção de erros, melhorias no layout" #. (itstool) path: revhistory/revision -#: C/index.docbook:119 +#: C/index.docbook:125 msgid "" "1.15 21 May 2010 sk bug and regression fixes" @@ -191,7 +202,7 @@ msgstr "" "authorinitials> correção de erros e regressões" #. (itstool) path: revhistory/revision -#: C/index.docbook:125 +#: C/index.docbook:131 msgid "" "1.14 28 March 2010 sk bugfixes and performance improvements" @@ -201,7 +212,7 @@ msgstr "" "revremark>" #. (itstool) path: revhistory/revision -#: C/index.docbook:131 +#: C/index.docbook:137 msgid "" "1.13 18 December 2009 " "sk broken tarball update atualização de tarball defeituoso" #. (itstool) path: revhistory/revision -#: C/index.docbook:137 +#: C/index.docbook:143 msgid "" "1.12 18 December 2009 " "sk new tool features and " @@ -222,7 +233,7 @@ msgstr "" "erros" #. (itstool) path: revhistory/revision -#: C/index.docbook:143 +#: C/index.docbook:149 msgid "" "1.11 16 November 2008 " "mal GNOME doc-utils migration Migração do GNOME doc-utils" #. (itstool) path: chapter/title -#: C/index.docbook:156 +#: C/index.docbook:162 msgid "Introduction" msgstr "Introdução" #. (itstool) path: chapter/para -#: C/index.docbook:158 +#: C/index.docbook:164 msgid "" "This chapter introduces GTK-Doc and gives an overview of what it is and how " "it is used." @@ -246,12 +257,12 @@ msgstr "" "usado." #. (itstool) path: sect1/title -#: C/index.docbook:164 +#: C/index.docbook:170 msgid "What is GTK-Doc?" msgstr "O que é GTK-Doc?" #. (itstool) path: sect1/para -#: C/index.docbook:166 +#: C/index.docbook:172 msgid "" "GTK-Doc is used to document C code. It is typically used to document the " "public API of libraries, such as the GTK+ and GNOME libraries. But it can " @@ -262,12 +273,12 @@ msgstr "" "GNOME. Mas ele também pode ser usado para documentar código de aplicativos." #. (itstool) path: sect1/title -#: C/index.docbook:174 +#: C/index.docbook:180 msgid "How Does GTK-Doc Work?" msgstr "Como o GTK-Doc funciona?" #. (itstool) path: sect1/para -#: C/index.docbook:176 +#: C/index.docbook:182 msgid "" "GTK-Doc works by using documentation of functions placed inside the source " "files in specially-formatted comment blocks, or documentation added to the " @@ -282,7 +293,7 @@ msgstr "" "arquivos de cabeçalho; ele não irá produzir saída para funções estáticas)." #. (itstool) path: sect1/para -#: C/index.docbook:183 +#: C/index.docbook:189 msgid "" "GTK-Doc consists of a number of perl scripts, each performing a different " "step in the process." @@ -291,12 +302,12 @@ msgstr "" "diferente no processo." #. (itstool) path: sect1/para -#: C/index.docbook:188 +#: C/index.docbook:194 msgid "There are 5 main steps in the process:" msgstr "Há 5 etapas principais no processo:" #. (itstool) path: listitem/para -#: C/index.docbook:195 +#: C/index.docbook:201 msgid "" "Writing the documentation. The author fills in the " "source files with the documentation for each function, macro, union etc. (In " @@ -309,7 +320,7 @@ msgstr "" "que não é mais recomendado)." #. (itstool) path: listitem/para -#: C/index.docbook:205 +#: C/index.docbook:211 msgid "" "Gathering information about the code. " "gtkdoc-scan scans the header files of the code " @@ -344,7 +355,7 @@ msgstr "" "txt no <módulo>-overrides.txt." #. (itstool) path: listitem/para -#: C/index.docbook:222 +#: C/index.docbook:228 msgid "" "gtkdoc-scangobj can also be used to dynamically " "query a library about any GObject subclasses it exports. It saves " @@ -358,7 +369,7 @@ msgstr "" "fornece." #. (itstool) path: listitem/para -#: C/index.docbook:228 +#: C/index.docbook:234 msgid "" "gtkdoc-scanobj should not be used anymore. It was " "needed in the past when GObject was still GtkObject inside gtk+." @@ -367,7 +378,7 @@ msgstr "" "era necessário no passado, quando GObject ainda era GtkObject dentro do gtk+." #. (itstool) path: listitem/para -#: C/index.docbook:235 +#: C/index.docbook:241 msgid "" "Generating the \"template\" files. gtkdoc-" "mktmpl creates a number of files in the gtkdocize supports now " @@ -398,7 +409,7 @@ msgstr "" "remova o diretório (ex.: do sistema de controle de versão)." #. (itstool) path: listitem/para -#: C/index.docbook:256 +#: C/index.docbook:262 msgid "" "Generating the SGML/XML and HTML/PDF. " "gtkdoc-mkdb turns the template files into SGML or " @@ -417,7 +428,7 @@ msgstr "" "introspecção e dos fontes. Nós recomendamos usar o Docbook XML." #. (itstool) path: listitem/para -#: C/index.docbook:267 +#: C/index.docbook:273 msgid "" "gtkdoc-mkhtml turns the SGML/XML files into HTML " "files in the html/ subdirectory. " @@ -431,7 +442,7 @@ msgstr "" "pacote>.pdf." #. (itstool) path: listitem/para -#: C/index.docbook:273 +#: C/index.docbook:279 msgid "" "Files in sgml/ or xml/ and html/Fixing up cross-references between documents. After " "installing the HTML files, gtkdoc-fixxref can be " @@ -466,22 +477,22 @@ msgstr "" "volta para links locais (onde aquelas documentações estão instaladas)." #. (itstool) path: sect1/title -#: C/index.docbook:299 +#: C/index.docbook:305 msgid "Getting GTK-Doc" msgstr "Obtendo GTK-Doc" #. (itstool) path: sect2/title -#: C/index.docbook:302 +#: C/index.docbook:308 msgid "Requirements" msgstr "Requisitos" #. (itstool) path: sect2/para -#: C/index.docbook:303 +#: C/index.docbook:309 msgid "Perl v5 - the main scripts are in Perl." msgstr "Perl v5 - os scripts principais são Perl." #. (itstool) path: sect2/para -#: C/index.docbook:306 +#: C/index.docbook:312 msgid "" "xsltproc - the xslt processor from libxslt xmlsoft.org/XSLT/" @@ -490,7 +501,7 @@ msgstr "" "\"http://xmlsoft.org/XSLT/\" type=\"http\">xmlsoft.org/XSLT/" #. (itstool) path: sect2/para -#: C/index.docbook:310 +#: C/index.docbook:316 msgid "" "docbook-xsl - the docbook xsl stylesheets sourceforge.net/projects/docbook/files/docbook-xsl" #. (itstool) path: sect2/para -#: C/index.docbook:314 +#: C/index.docbook:320 msgid "Python - optional - for gtkdoc-depscan" msgstr "Python - opcional - para gtkdoc-depscan" #. (itstool) path: sect2/para -#: C/index.docbook:317 +#: C/index.docbook:323 msgid "" "One of source-highlight, highlight " "or vim - optional - used for syntax highlighting of " @@ -517,17 +528,17 @@ msgstr "" "sintaxe de exemplos" #. (itstool) path: sect1/title -#: C/index.docbook:325 +#: C/index.docbook:331 msgid "About GTK-Doc" msgstr "Sobre GTK-Doc" #. (itstool) path: sect1/para -#: C/index.docbook:327 C/index.docbook:341 +#: C/index.docbook:333 C/index.docbook:347 msgid "(FIXME)" msgstr "(CORRIJA-ME)" #. (itstool) path: sect1/para -#: C/index.docbook:331 +#: C/index.docbook:337 msgid "" "(History, authors, web pages, mailing list, license, future plans, " "comparison with other similar systems.)" @@ -536,22 +547,22 @@ msgstr "" "futuros, comparação com outros sistemas similares.)" #. (itstool) path: sect1/title -#: C/index.docbook:339 +#: C/index.docbook:345 msgid "About this Manual" msgstr "Sobre este manual" #. (itstool) path: sect1/para -#: C/index.docbook:345 +#: C/index.docbook:351 msgid "(who it is meant for, where you can get it, license)" msgstr "(pra quem ele serve, onde você pode obtê-lo, licença)" #. (itstool) path: chapter/title -#: C/index.docbook:354 +#: C/index.docbook:360 msgid "Setting up your project" msgstr "Preparando seu projeto" #. (itstool) path: chapter/para -#: C/index.docbook:356 +#: C/index.docbook:362 msgid "" "The next sections describe what steps to perform to integrate GTK-Doc into " "your project. Theses sections assume we work on a project called 'meep'. " @@ -571,12 +582,12 @@ msgstr "" "trabalhar em uma configuração de compilação diferente." #. (itstool) path: sect1/title -#: C/index.docbook:367 +#: C/index.docbook:373 msgid "Setting up a skeleton documentation" msgstr "Preparando o esqueleto de uma documentação" #. (itstool) path: sect1/para -#: C/index.docbook:369 +#: C/index.docbook:375 msgid "" "Under your top-level project directory create folders called docs/reference " "(this way you can also have docs/help for end-user documentation). It is " @@ -590,12 +601,12 @@ msgstr "" "obrigatória." #. (itstool) path: example/title -#: C/index.docbook:378 +#: C/index.docbook:384 msgid "Example directory structure" msgstr "Exemplo de estrutura de diretórios" #. (itstool) path: example/programlisting -#: C/index.docbook:379 +#: C/index.docbook:385 #, no-wrap msgid "" "\n" @@ -619,18 +630,18 @@ msgstr "" " meeper/\n" #. (itstool) path: sect1/para -#: C/index.docbook:376 +#: C/index.docbook:382 msgid "This can then look as shown below: <_:example-1/>" msgstr "Isto pode, então, parecer como exibido abaixo: <_:example-1/>" #. (itstool) path: sect1/title #. (itstool) path: example/title -#: C/index.docbook:394 C/index.docbook:401 +#: C/index.docbook:400 C/index.docbook:407 msgid "Integration with autoconf" msgstr "Integração com autoconf" #. (itstool) path: sect1/para -#: C/index.docbook:396 +#: C/index.docbook:402 msgid "" "Very easy! Just add one line to your configure.ac " "script." @@ -639,7 +650,7 @@ msgstr "" "filename>." #. (itstool) path: example/programlisting -#: C/index.docbook:402 +#: C/index.docbook:408 #, no-wrap msgid "" "\n" @@ -651,12 +662,12 @@ msgstr "" "GTK_DOC_CHECK([1.14],[--flavour no-tmpl])\n" #. (itstool) path: example/title -#: C/index.docbook:414 +#: C/index.docbook:420 msgid "Keep gtk-doc optional" msgstr "Mantenha o gtk-doc como opcional" #. (itstool) path: example/programlisting -#: C/index.docbook:415 +#: C/index.docbook:421 #, no-wrap msgid "" "\n" @@ -676,7 +687,7 @@ msgstr "" "])\n" #. (itstool) path: sect1/para -#: C/index.docbook:409 +#: C/index.docbook:415 msgid "" "This will require all developers to have gtk-doc installed. If it is okay " "for your project to have optional api-doc build setup, you can solve this as " @@ -690,7 +701,7 @@ msgstr "" "GTK_DOC_CHECK no começo de uma linha. <_:example-1/>" #. (itstool) path: sect1/para -#: C/index.docbook:426 +#: C/index.docbook:432 msgid "" "The first argument is used to check for the gtkdocversion at configure time. " "The 2nd, optional argument is used by gtkdocize. " @@ -703,30 +714,30 @@ msgstr "" "também adiciona várias opções de configuração:" #. (itstool) path: listitem/para -#: C/index.docbook:432 +#: C/index.docbook:438 msgid "--with-html-dir=PATH : path to installed docs" msgstr "--with-html-dir=CAMINHO : caminho para as documentações instaladas" #. (itstool) path: listitem/para -#: C/index.docbook:433 +#: C/index.docbook:439 msgid "--enable-gtk-doc : use gtk-doc to build documentation [default=no]" msgstr "--enable-gtk-doc : usa gtk-doc para compilar documentação [padrão=no]" #. (itstool) path: listitem/para -#: C/index.docbook:434 +#: C/index.docbook:440 msgid "" "--enable-gtk-doc-html : build documentation in html format [default=yes]" msgstr "" "--enable-gtk-doc-html : compila documentação em formato html [padrão=sim]" #. (itstool) path: listitem/para -#: C/index.docbook:435 +#: C/index.docbook:441 msgid "--enable-gtk-doc-pdf : build documentation in pdf format [default=no]" msgstr "" "--enable-gtk-doc-pdf : compila documentação em formato pdf [padrão=não]" #. (itstool) path: important/para -#: C/index.docbook:439 +#: C/index.docbook:445 msgid "" "GTK-Doc is disabled by default! Remember to pass the option to the next configure run. " @@ -739,7 +750,7 @@ msgstr "" "que faz sentido para usuários, mas não para desenvolvedores)." #. (itstool) path: sect1/para -#: C/index.docbook:447 +#: C/index.docbook:453 msgid "" "Furthermore it is recommended that you have the following line inside you " "configure.ac script. This allows " @@ -752,12 +763,12 @@ msgstr "" "macro para GTK_DOC_CHECK para o seu projeto." #. (itstool) path: example/title -#: C/index.docbook:455 +#: C/index.docbook:461 msgid "Preparation for gtkdocize" msgstr "Preparação para gtkdocize" #. (itstool) path: example/programlisting -#: C/index.docbook:456 +#: C/index.docbook:462 #, no-wrap msgid "" "\n" @@ -767,7 +778,7 @@ msgstr "" "AC_CONFIG_MACRO_DIR(m4)\n" #. (itstool) path: sect1/para -#: C/index.docbook:461 +#: C/index.docbook:467 msgid "" "After all changes to configure.ac are made, update the " "configure file. This can be done by re-running " @@ -778,12 +789,12 @@ msgstr "" "executando novamente autoreconf -i ou autogen.sh." #. (itstool) path: sect1/title -#: C/index.docbook:469 +#: C/index.docbook:475 msgid "Integration with automake" msgstr "Integração com automake" #. (itstool) path: sect1/para -#: C/index.docbook:471 +#: C/index.docbook:477 msgid "" "First copy the Makefile.am from the examples sub directory of the Makefile.am. All the settings have a comment above that describes their " @@ -821,12 +832,12 @@ msgstr "" "suporte a pra listar os parâmetros disponíveis." #. (itstool) path: sect1/title -#: C/index.docbook:496 +#: C/index.docbook:502 msgid "Integration with autogen" msgstr "Integração com autogen" #. (itstool) path: sect1/para -#: C/index.docbook:498 +#: C/index.docbook:504 msgid "" "Most projects will have an autogen.sh script to setup " "the build infrastructure after a checkout from version control system (such " @@ -841,12 +852,12 @@ msgstr "" "O gtkdocize deveria ser executado antes de autoheader, automake ou autoconf." #. (itstool) path: example/title -#: C/index.docbook:507 +#: C/index.docbook:513 msgid "Running gtkdocize from autogen.sh" msgstr "Executando gtkdocize no autogen.sh" #. (itstool) path: example/programlisting -#: C/index.docbook:508 +#: C/index.docbook:514 #, no-wrap msgid "" "\n" @@ -856,7 +867,7 @@ msgstr "" "gtkdocize || exit 1\n" #. (itstool) path: sect1/para -#: C/index.docbook:514 +#: C/index.docbook:520 msgid "" "When running gtkdocize it copies gtk-" "doc.make to your project root (or any directory specified by the " @@ -872,7 +883,7 @@ msgstr "" "gtkdocize." #. (itstool) path: sect1/para -#: C/index.docbook:523 +#: C/index.docbook:529 msgid "" "Historically GTK-Doc was generating template files where developers entered " "the docs. This turned out to be not so good (e.g. the need for having " @@ -905,12 +916,12 @@ msgstr "" #. (itstool) path: sect1/title #. (itstool) path: example/title -#: C/index.docbook:540 C/index.docbook:557 +#: C/index.docbook:546 C/index.docbook:563 msgid "Running the doc build" msgstr "Executando a compilação da documentação" #. (itstool) path: sect1/para -#: C/index.docbook:542 +#: C/index.docbook:548 msgid "" "After the previous steps it's time to run the build. First we need to rerun " "autogen.sh. If this script runs configure for you, then " @@ -924,7 +935,7 @@ msgstr "" "configure com esta opção em seguida." #. (itstool) path: sect1/para -#: C/index.docbook:549 +#: C/index.docbook:555 msgid "" "The first make run generates several additional files in the doc-" "directories. The important ones are: <package>.types<pacote>-sections.txt." #. (itstool) path: example/programlisting -#: C/index.docbook:558 +#: C/index.docbook:564 #, no-wrap msgid "" "\n" @@ -949,7 +960,7 @@ msgstr "" "make\n" #. (itstool) path: sect1/para -#: C/index.docbook:564 +#: C/index.docbook:570 msgid "" "Now you can point your browser to docs/reference/<package>/" "index.html. Yes, it's a bit disappointing still. But hang-on, " @@ -961,12 +972,12 @@ msgstr "" "páginas com vida." #. (itstool) path: sect1/title -#: C/index.docbook:572 +#: C/index.docbook:578 msgid "Integration with version control systems" msgstr "Integração com sistemas de controle de versão" #. (itstool) path: sect1/para -#: C/index.docbook:574 +#: C/index.docbook:580 msgid "" "As a rule of the thumb, it's those files you edit, that should go under " "version control. For typical projects it's these files: <" @@ -981,12 +992,12 @@ msgstr "" "filename>, Makefile.am" #. (itstool) path: sect1/title -#: C/index.docbook:585 +#: C/index.docbook:591 msgid "Integration with plain makefiles or other build systems" msgstr "Integração com makefiles simples ou outros sistemas de compilação" #. (itstool) path: sect1/para -#: C/index.docbook:587 +#: C/index.docbook:593 msgid "" "In the case one does not want to use automake and therefore gtk-" "doc.mak one will need to call the gtkdoc tools in the right order " @@ -997,12 +1008,12 @@ msgstr "" "correta nos makefiles devidos (ou outras ferramentas de compilação)." #. (itstool) path: example/title -#: C/index.docbook:594 +#: C/index.docbook:600 msgid "Documentation build steps" msgstr "Etapas de compilação da documentação" #. (itstool) path: example/programlisting -#: C/index.docbook:595 +#: C/index.docbook:601 #, no-wrap msgid "" "\n" @@ -1028,7 +1039,7 @@ msgstr "" "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html\n" #. (itstool) path: sect1/para -#: C/index.docbook:609 +#: C/index.docbook:615 msgid "" "One will need to look at the Makefile.am and " "gtk-doc.mak to pick the extra options needed." @@ -1037,12 +1048,12 @@ msgstr "" "doc.mak para obter as opções extras necessárias." #. (itstool) path: chapter/title -#: C/index.docbook:618 +#: C/index.docbook:624 msgid "Documenting the code" msgstr "Documentando o código" #. (itstool) path: chapter/para -#: C/index.docbook:620 +#: C/index.docbook:626 msgid "" "GTK-Doc uses source code comment with a special syntax for code " "documentation. Further it retrieves information about your project structure " @@ -1055,12 +1066,12 @@ msgstr "" "descobrir todas as informações sobre a sintaxe dos comentários." #. (itstool) path: note/title -#: C/index.docbook:628 +#: C/index.docbook:634 msgid "Documentation placement" msgstr "Localização da documentação" #. (itstool) path: note/para -#: C/index.docbook:629 +#: C/index.docbook:635 msgid "" "In the past most documentation had to be filled into files residing inside " "the tmpl directory. This has the disadvantages that the " @@ -1074,7 +1085,7 @@ msgstr "" "versão." #. (itstool) path: note/para -#: C/index.docbook:635 +#: C/index.docbook:641 msgid "" "The avoid the aforementioned problems we suggest putting the documentation " "inside the sources. This manual will only describe this way of documenting " @@ -1085,12 +1096,12 @@ msgstr "" "descrever esta forma de documentar código." #. (itstool) path: example/title -#: C/index.docbook:646 C/index.docbook:663 +#: C/index.docbook:652 C/index.docbook:669 msgid "GTK-Doc comment block" msgstr "Bloco de comentário do GTK-Doc" #. (itstool) path: example/programlisting -#: C/index.docbook:647 +#: C/index.docbook:653 #, no-wrap msgid "" "\n" @@ -1104,7 +1115,7 @@ msgstr "" "#endif\n" #. (itstool) path: chapter/para -#: C/index.docbook:642 +#: C/index.docbook:648 msgid "" "The scanner can handle the majority of C headers fine. In the case of " "receiving warnings from the scanner that look like a special case, one can " @@ -1115,12 +1126,12 @@ msgstr "" "pode-se informar ao GTK-Doc para ignorá-los. <_:example-1/>" #. (itstool) path: sect1/title -#: C/index.docbook:658 +#: C/index.docbook:664 msgid "Documentation comments" msgstr "Comentários de documentação" #. (itstool) path: example/programlisting -#: C/index.docbook:664 +#: C/index.docbook:670 #, no-wrap msgid "" "\n" @@ -1136,7 +1147,7 @@ msgstr "" " */\n" #. (itstool) path: sect1/para -#: C/index.docbook:660 +#: C/index.docbook:666 msgid "" "A multiline comment that starts with an additional '*' marks a documentation " "block that will be processed by the GTK-Doc tools. <_:example-1/>" @@ -1146,7 +1157,7 @@ msgstr "" # Ocultei o TODO da tradução. Para que server? :/ #. (itstool) path: sect1/para -#: C/index.docbook:673 +#: C/index.docbook:679 msgid "" "The 'identifier' is one line with the name of the item the comment is " "related to. The syntax differs a little depending on the item. (TODO add " @@ -1156,7 +1167,7 @@ msgstr "" "relacionado. A sintaxe difere um pouco dependendo do item." #. (itstool) path: sect1/para -#: C/index.docbook:679 +#: C/index.docbook:685 msgid "" "The 'documentation' block is also different for each symbol type. Symbol " "types that get parameters such as functions or macros have the parameter " @@ -1176,7 +1187,7 @@ msgstr "" "espaço e espaço). Isso é útil em textos pré-formatados (listagens de código)." #. (itstool) path: listitem/para -#: C/index.docbook:696 +#: C/index.docbook:702 msgid "" "What it is: The name for a class or function can sometimes be misleading for " "people coming from a different background." @@ -1185,24 +1196,24 @@ msgstr "" "entendimento equivocado pessoas com experiências diferentes." #. (itstool) path: listitem/para -#: C/index.docbook:702 +#: C/index.docbook:708 msgid "" "What it does: Tell about common uses. Put it in relation with the other API." msgstr "" "O que isso faz: Fale sobre usos comuns. Coloque em relação com a outra API." #. (itstool) path: tip/para -#: C/index.docbook:692 +#: C/index.docbook:698 msgid "When documenting code, describe two aspects: <_:itemizedlist-1/>" msgstr "Ao documentar um código, descreva dois aspectos: <_:itemizedlist-1/>" #. (itstool) path: listitem/para -#: C/index.docbook:717 +#: C/index.docbook:723 msgid "Use function() to refer to functions or macros which take arguments." msgstr "Use function() para referir às funções ou macros que levam argumentos." #. (itstool) path: listitem/para -#: C/index.docbook:722 +#: C/index.docbook:728 msgid "" "Use @param to refer to parameters. Also use this when referring to " "parameters of other functions, related to the one being described." @@ -1211,12 +1222,12 @@ msgstr "" "parâmetros de outras funções, relacionadas àquele sendo descrito." #. (itstool) path: listitem/para -#: C/index.docbook:728 +#: C/index.docbook:734 msgid "Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS." msgstr "Use %constant para se referir a uma constante, ex.: %G_TRAVERSE_LEAFS." #. (itstool) path: listitem/para -#: C/index.docbook:733 +#: C/index.docbook:739 msgid "" "Use #symbol to refer to other types of symbol, e.g. structs and enums and " "macros which don't take arguments." @@ -1225,17 +1236,17 @@ msgstr "" "e macros que não levam argumentos." #. (itstool) path: listitem/para -#: C/index.docbook:739 +#: C/index.docbook:745 msgid "Use #Object::signal to refer to a GObject signal." msgstr "Use #Object::signal para se referir a um sinal de GObject." #. (itstool) path: listitem/para -#: C/index.docbook:744 +#: C/index.docbook:750 msgid "Use #Object:property to refer to a GObject property." msgstr "Use #Object:property para se referir a uma propriedade de GObject." #. (itstool) path: listitem/para -#: C/index.docbook:749 +#: C/index.docbook:755 msgid "" "Use #Struct.field to refer to a field inside a structure and #GObjectClass." "foo_bar() to refer to a vmethod." @@ -1244,7 +1255,7 @@ msgstr "" "#GObjectClass.foo_bar() para se referir a um vmethod." #. (itstool) path: sect1/para -#: C/index.docbook:711 +#: C/index.docbook:717 msgid "" "One advantage of hyper-text over plain-text is the ability to have links in " "the document. Writing the correct markup for a link can be tedious though. " @@ -1257,7 +1268,7 @@ msgstr "" "itemizedlist-1/>" #. (itstool) path: tip/para -#: C/index.docbook:758 +#: C/index.docbook:764 msgid "" "If you need to use the special characters '<', '>', '()', '@', '%', or " "'#' in your documentation without GTK-Doc changing them you can use the XML " @@ -1272,7 +1283,7 @@ msgstr "" "respectivamente, ou escapá-los com uma contrabarra \"\\\"." #. (itstool) path: sect1/para -#: C/index.docbook:767 +#: C/index.docbook:773 msgid "" "DocBook can do more than just links. One can also have lists, examples, " "headings, and images. As of version 1.20, the preferred way is to use a " @@ -1290,7 +1301,7 @@ msgstr "" "linhas começando com um traço." #. (itstool) path: sect1/para -#: C/index.docbook:778 +#: C/index.docbook:784 msgid "" "In older GTK-Doc releases, if you need support for additional formatting, " "you would need to enable the usage of docbook SGML/XML tags inside doc-" @@ -1305,12 +1316,12 @@ msgstr "" "MKDB_OPTIONS dentro de Makefile.am." #. (itstool) path: example/title -#: C/index.docbook:788 +#: C/index.docbook:794 msgid "GTK-Doc comment block using Markdown" msgstr "Bloco de comentário do GTK-Doc usando Markdown" #. (itstool) path: example/programlisting -#: C/index.docbook:789 +#: C/index.docbook:795 #, no-wrap msgid "" "\n" @@ -1386,7 +1397,7 @@ msgstr "" " */\n" #. (itstool) path: sect1/para -#: C/index.docbook:828 +#: C/index.docbook:834 msgid "" "More examples of what markdown tags are supported can be found in the Referência de sintaxe de markdown de documentação." #. (itstool) path: tip/para -#: C/index.docbook:834 +#: C/index.docbook:840 msgid "" "As already mentioned earlier GTK-Doc is for documenting public API. Thus one " "cannot write documentation for static symbols. Nevertheless it is good to " @@ -1417,12 +1428,12 @@ msgstr "" "arquivo e seções." #. (itstool) path: sect1/title -#: C/index.docbook:848 +#: C/index.docbook:854 msgid "Documenting sections" msgstr "Documentando seções" #. (itstool) path: sect1/para -#: C/index.docbook:850 +#: C/index.docbook:856 msgid "" "Each section of the documentation contains information about one class or " "module. To introduce the component one can write a section block. The short " @@ -1435,12 +1446,12 @@ msgstr "" "os @fields são opcionais." #. (itstool) path: example/title -#: C/index.docbook:858 +#: C/index.docbook:864 msgid "Section comment block" msgstr "Bloco de comentário de sessão" #. (itstool) path: example/programlisting -#: C/index.docbook:859 +#: C/index.docbook:865 #, no-wrap msgid "" "\n" @@ -1472,12 +1483,12 @@ msgstr "" " */\n" #. (itstool) path: varlistentry/term -#: C/index.docbook:878 +#: C/index.docbook:884 msgid "SECTION:<name>" msgstr "SECTION:<nome>" #. (itstool) path: listitem/para -#: C/index.docbook:880 +#: C/index.docbook:886 msgid "" "The name links the section documentation to the respective part in the " "<package>-sections.txt file. The name give here " @@ -1490,12 +1501,12 @@ msgstr "" "txt." #. (itstool) path: varlistentry/term -#: C/index.docbook:889 +#: C/index.docbook:895 msgid "@short_description" msgstr "@short_description" #. (itstool) path: listitem/para -#: C/index.docbook:891 +#: C/index.docbook:897 msgid "" "A one line description of the section, that later will appear after the " "links in the TOC and at the top of the section page." @@ -1504,12 +1515,12 @@ msgstr "" "no TOC (sumário) no topo da página da sessão." #. (itstool) path: varlistentry/term -#: C/index.docbook:898 +#: C/index.docbook:904 msgid "@title" msgstr "@title" #. (itstool) path: listitem/para -#: C/index.docbook:900 +#: C/index.docbook:906 msgid "" "The section title defaults to <name> from the SECTION declaration. It " "can be overridden with the @title field." @@ -1518,12 +1529,12 @@ msgstr "" "pode ser sobrescrito com o campo @title." #. (itstool) path: varlistentry/term -#: C/index.docbook:907 +#: C/index.docbook:913 msgid "@section_id" msgstr "@section_id" #. (itstool) path: listitem/para -#: C/index.docbook:909 +#: C/index.docbook:915 msgid "" "Overrides the use of title as a section identifier. For GObjects the <" "title> is used as a section_id and for other sections it is <" @@ -1534,22 +1545,22 @@ msgstr "" "MÓDULO>-<title>." #. (itstool) path: varlistentry/term -#: C/index.docbook:917 +#: C/index.docbook:923 msgid "@see_also" msgstr "@see_also" #. (itstool) path: listitem/para -#: C/index.docbook:919 +#: C/index.docbook:925 msgid "A list of symbols that are related to this section." msgstr "Uma lista de símbolos que estão relacionados a esta sessão." #. (itstool) path: varlistentry/term -#: C/index.docbook:925 +#: C/index.docbook:931 msgid "@stability" msgstr "@stability" #. (itstool) path: listitem/para -#: C/index.docbook:932 +#: C/index.docbook:938 msgid "" "Stable - The intention of a Stable interface is to enable arbitrary third " "parties to develop applications to these interfaces, release them, and have " @@ -1566,7 +1577,7 @@ msgstr "" "alterações incompatíveis sejam raras e que tenham fortes justificativas." #. (itstool) path: listitem/para -#: C/index.docbook:944 +#: C/index.docbook:950 msgid "" "Unstable - Unstable interfaces are experimental or transitional. They are " "typically used to give outside developers early access to new or rapidly " @@ -1582,7 +1593,7 @@ msgstr "" "fontes de uma versão menor para a próxima." #. (itstool) path: listitem/para -#: C/index.docbook:956 +#: C/index.docbook:962 msgid "" "Private - An interface that can be used within the GNOME stack itself, but " "that is not documented for end-users. Such functions should only be used in " @@ -1593,7 +1604,7 @@ msgstr "" "usadas nas formas especificadas e documentadas." #. (itstool) path: listitem/para -#: C/index.docbook:965 +#: C/index.docbook:971 msgid "" "Internal - An interface that is internal to a module and does not require " "end-user documentation. Functions that are undocumented are assumed to be " @@ -1604,7 +1615,7 @@ msgstr "" "sendo \"Interna\"." #. (itstool) path: listitem/para -#: C/index.docbook:927 +#: C/index.docbook:933 msgid "" "An informal description of the stability level this API has. We recommend " "the use of one of these terms: <_:itemizedlist-1/>" @@ -1613,12 +1624,12 @@ msgstr "" "recomendamos o uso de um desses termos: <_:itemizedlist-1/>" #. (itstool) path: varlistentry/term -#: C/index.docbook:977 +#: C/index.docbook:983 msgid "@include" msgstr "@include" #. (itstool) path: listitem/para -#: C/index.docbook:979 +#: C/index.docbook:985 msgid "" "The #include files to show in the section synopsis (a " "comma separated list), overriding the global value from the " msgstr "Por favor, lembre-se de: <_:itemizedlist-1/>" #. (itstool) path: sect2/para -#: C/index.docbook:1094 +#: C/index.docbook:1100 msgid "" "Gtk-doc assumes all symbols (macros, functions) starting with '_' are " "private. They are treated like static functions." @@ -1808,7 +1819,7 @@ msgstr "" "são privadas. Elas são tratadas como funções estáticas." #. (itstool) path: sect2/para -#: C/index.docbook:1099 +#: C/index.docbook:1105 msgid "" "Also, take a look at GObject Introspection annotation tags: http://live." "gnome.org/GObjectIntrospection/Annotations" @@ -1817,7 +1828,7 @@ msgstr "" "live.gnome.org/GObjectIntrospection/Annotations" #. (itstool) path: example/programlisting -#: C/index.docbook:1107 +#: C/index.docbook:1113 #, no-wrap msgid "" "\n" @@ -1859,27 +1870,27 @@ msgstr "" " */\n" #. (itstool) path: variablelist/title -#: C/index.docbook:1128 +#: C/index.docbook:1134 msgid "Function tags" msgstr "Tags de função" #. (itstool) path: varlistentry/term -#: C/index.docbook:1129 +#: C/index.docbook:1135 msgid "Returns:" msgstr "Returns:" #. (itstool) path: listitem/para -#: C/index.docbook:1131 +#: C/index.docbook:1137 msgid "Paragraph describing the returned result." msgstr "Parágrafo descrevendo o resultado retornado." #. (itstool) path: varlistentry/term -#: C/index.docbook:1136 +#: C/index.docbook:1142 msgid "@...:" msgstr "@...:" #. (itstool) path: listitem/para -#: C/index.docbook:1138 +#: C/index.docbook:1144 msgid "" "In case the function has variadic arguments, you should use this tag " "(@Varargs: does also work for historic reasons)." @@ -1889,12 +1900,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1148 C/index.docbook:1150 +#: C/index.docbook:1154 C/index.docbook:1156 msgid "Property comment block" msgstr "Bloco de comentário de propriedade" #. (itstool) path: example/programlisting -#: C/index.docbook:1151 +#: C/index.docbook:1157 #, no-wrap msgid "" "\n" @@ -1915,12 +1926,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1163 C/index.docbook:1182 +#: C/index.docbook:1169 C/index.docbook:1188 msgid "Signal comment block" msgstr "Bloco de comentário de sinal" #. (itstool) path: listitem/para -#: C/index.docbook:1169 +#: C/index.docbook:1175 msgid "" "Document when the signal is emitted and whether it is emitted before or " "after other signals." @@ -1929,12 +1940,12 @@ msgstr "" "sinais." #. (itstool) path: listitem/para -#: C/index.docbook:1175 +#: C/index.docbook:1181 msgid "Document what an application might do in the signal handler." msgstr "Documente o que um aplicativo pode fazer no manipulador do sinal." #. (itstool) path: example/programlisting -#: C/index.docbook:1183 +#: C/index.docbook:1189 #, no-wrap msgid "" "\n" @@ -1965,12 +1976,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1200 C/index.docbook:1201 +#: C/index.docbook:1206 C/index.docbook:1207 msgid "Struct comment block" msgstr "Bloco de comentário de struct" #. (itstool) path: example/programlisting -#: C/index.docbook:1202 +#: C/index.docbook:1208 #, no-wrap msgid "" "\n" @@ -2004,7 +2015,7 @@ msgstr "" "} FooWidget;\n" #. (itstool) path: sect2/para -#: C/index.docbook:1219 +#: C/index.docbook:1225 msgid "" "Use /*< private >*/ before the private struct fields you " "want to hide. Use /*< public >*/ for the reverse " @@ -2015,7 +2026,7 @@ msgstr "" "comportamento inverso." #. (itstool) path: sect2/para -#: C/index.docbook:1225 +#: C/index.docbook:1231 msgid "" "Struct comment blocks can also be used for GObjects and GObjectClasses. It " "is usually a good idea to add a comment block for a class, if it has " @@ -2035,12 +2046,12 @@ msgstr "" #. (itstool) path: sect2/title #. (itstool) path: example/title -#: C/index.docbook:1237 C/index.docbook:1238 +#: C/index.docbook:1243 C/index.docbook:1244 msgid "Enum comment block" msgstr "Bloco de comentário de enum" #. (itstool) path: example/programlisting -#: C/index.docbook:1239 +#: C/index.docbook:1245 #, no-wrap msgid "" "\n" @@ -2074,7 +2085,7 @@ msgstr "" "} Alguma coisa;\n" #. (itstool) path: sect2/para -#: C/index.docbook:1256 +#: C/index.docbook:1262 msgid "" "Use /*< private >*/ before the private enum values you " "want to hide. Use /*< public >*/ for the reverse " @@ -2085,12 +2096,12 @@ msgstr "" "comportamento inverso." #. (itstool) path: sect1/title -#: C/index.docbook:1266 +#: C/index.docbook:1272 msgid "Useful DocBook tags" msgstr "Tags úteis do DocBook" #. (itstool) path: sect1/para -#: C/index.docbook:1268 +#: C/index.docbook:1274 msgid "" "Here are some DocBook tags which are most useful when documenting the code." msgstr "" @@ -2098,7 +2109,7 @@ msgstr "" "documentado o código." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1277 +#: C/index.docbook:1283 #, no-wrap msgid "" "\n" @@ -2108,7 +2119,7 @@ msgstr "" "<link linkend=\"glib-Hash-Tables\">Tabela de hashes</link>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1273 +#: C/index.docbook:1279 msgid "" "To link to another section in the GTK docs: <_:informalexample-1/> The " "linkend is the SGML/XML id on the top item of the page you want to link to. " @@ -2124,7 +2135,7 @@ msgstr "" "convertidos em '-' para estar em conformidade com SGML/XML." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1290 +#: C/index.docbook:1296 #, no-wrap msgid "" "\n" @@ -2134,7 +2145,7 @@ msgstr "" "<function>...</function>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1287 +#: C/index.docbook:1293 msgid "" "To refer to an external function, e.g. a standard C function: <_:" "informalexample-1/>" @@ -2143,7 +2154,7 @@ msgstr "" "do C: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1299 +#: C/index.docbook:1305 #, no-wrap msgid "" "\n" @@ -2163,7 +2174,7 @@ msgstr "" "</example>\n" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1310 +#: C/index.docbook:1316 #, no-wrap msgid "" "\n" @@ -2181,7 +2192,7 @@ msgstr "" "</informalexample>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1296 +#: C/index.docbook:1302 msgid "" "To include example code: <_:informalexample-1/> or possibly this, for very " "short code fragments which don't need a title: <_:informalexample-2/> For " @@ -2193,7 +2204,7 @@ msgstr "" "abreviação: |[ ... ]|" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1329 +#: C/index.docbook:1335 #, no-wrap msgid "" "\n" @@ -2225,12 +2236,12 @@ msgstr "" "</itemizedlist>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1326 +#: C/index.docbook:1332 msgid "To include bulleted lists: <_:informalexample-1/>" msgstr "Para incluir listas com marcadores: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1349 +#: C/index.docbook:1355 #, no-wrap msgid "" "\n" @@ -2248,13 +2259,13 @@ msgstr "" "</note>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1346 +#: C/index.docbook:1352 msgid "" "To include a note which stands out from the text: <_:informalexample-1/>" msgstr "Para incluir uma nota que fique fora do texto: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1362 +#: C/index.docbook:1368 #, no-wrap msgid "" "\n" @@ -2264,12 +2275,12 @@ msgstr "" "<type>unsigned char</type>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1359 +#: C/index.docbook:1365 msgid "To refer to a type: <_:informalexample-1/>" msgstr "Para se referir a um tipo: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1371 +#: C/index.docbook:1377 #, no-wrap msgid "" "\n" @@ -2279,7 +2290,7 @@ msgstr "" "<structname>XFontStruct</structname>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1368 +#: C/index.docbook:1374 msgid "" "To refer to an external structure (not one described in the GTK docs): <_:" "informalexample-1/>" @@ -2288,7 +2299,7 @@ msgstr "" "GTK): <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1380 +#: C/index.docbook:1386 #, no-wrap msgid "" "\n" @@ -2298,12 +2309,12 @@ msgstr "" "<structfield>len</structfield>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1377 +#: C/index.docbook:1383 msgid "To refer to a field of a structure: <_:informalexample-1/>" msgstr "Para se referir a um campo de uma estrutura: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1389 +#: C/index.docbook:1395 #, no-wrap msgid "" "\n" @@ -2313,7 +2324,7 @@ msgstr "" "<classname>GtkWidget</classname>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1386 +#: C/index.docbook:1392 msgid "" "To refer to a class name, we could possibly use: <_:informalexample-1/> but " "you'll probably be using #GtkWidget instead (to automatically create a link " @@ -2326,7 +2337,7 @@ msgstr "" "veja as abreviações)." #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1400 +#: C/index.docbook:1406 #, no-wrap msgid "" "\n" @@ -2336,12 +2347,12 @@ msgstr "" "<emphasis>Isso é importante</emphasis>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1397 +#: C/index.docbook:1403 msgid "To emphasize text: <_:informalexample-1/>" msgstr "Para enfatizar um texto: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1409 +#: C/index.docbook:1415 #, no-wrap msgid "" "\n" @@ -2351,12 +2362,12 @@ msgstr "" "<filename>/home/usuario/documentos</filename>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1406 +#: C/index.docbook:1412 msgid "For filenames use: <_:informalexample-1/>" msgstr "Para nome de arquivos use: <_:informalexample-1/>" #. (itstool) path: informalexample/programlisting -#: C/index.docbook:1418 +#: C/index.docbook:1424 #, no-wrap msgid "" "\n" @@ -2366,17 +2377,17 @@ msgstr "" "<keycombo><keycap>Control</keycap><keycap>L</keycap></keycombo>\n" #. (itstool) path: sect1/para -#: C/index.docbook:1415 +#: C/index.docbook:1421 msgid "To refer to keys use: <_:informalexample-1/>" msgstr "Para se referir a chaves use: <_:informalexample-1/>" #. (itstool) path: chapter/title -#: C/index.docbook:1428 +#: C/index.docbook:1434 msgid "Filling the extra files" msgstr "Preenchendo os arquivos extras" #. (itstool) path: chapter/para -#: C/index.docbook:1430 +#: C/index.docbook:1436 msgid "" "There are a couple of extra files, that need to be maintained along with the " "inline source code comments: <package>.types, " @@ -2389,12 +2400,12 @@ msgstr "" "<pacote>-sections.txt." #. (itstool) path: sect1/title -#: C/index.docbook:1439 +#: C/index.docbook:1445 msgid "Editing the types file" msgstr "Editando o arquivo de tipos" #. (itstool) path: sect1/para -#: C/index.docbook:1441 +#: C/index.docbook:1447 msgid "" "If your library or application includes GObjects, you want their signals, " "arguments/parameters and position in the hierarchy to be shown in the " @@ -2409,12 +2420,12 @@ msgstr "" "<pacote>.types." #. (itstool) path: example/title -#: C/index.docbook:1450 +#: C/index.docbook:1456 msgid "Example types file snippet" msgstr "Trecho de exemplo de arquivo de tipos" #. (itstool) path: example/programlisting -#: C/index.docbook:1451 +#: C/index.docbook:1457 #, no-wrap msgid "" "\n" @@ -2434,7 +2445,7 @@ msgstr "" "gtk_arrow_get_type\n" #. (itstool) path: sect1/para -#: C/index.docbook:1462 +#: C/index.docbook:1468 msgid "" "Since GTK-Doc 1.8 gtkdoc-scan can generate this " "list for you. Just add \"--rebuild-types\" to SCAN_OPTIONS in " @@ -2447,12 +2458,12 @@ msgstr "" "deveria distribuir o arquivo de tipos nem tê-lo sob um controle de versão." #. (itstool) path: sect1/title -#: C/index.docbook:1471 +#: C/index.docbook:1477 msgid "Editing the master document" msgstr "Editando o documento mestre" #. (itstool) path: sect1/para -#: C/index.docbook:1473 +#: C/index.docbook:1479 msgid "" "GTK-Doc produces documentation in DocBook SGML/XML. When processing the " "inline source comments, the GTK-Doc tools generate one documentation page " @@ -2465,7 +2476,7 @@ msgstr "" "mestre os inclui e os coloca em uma ordem." #. (itstool) path: sect1/para -#: C/index.docbook:1480 +#: C/index.docbook:1486 msgid "" "While GTK-Doc creates a template master document for you, later run will not " "touch it again. This means that one can freely structure the documentation. " @@ -2482,7 +2493,7 @@ msgstr "" "em tempo para ver se há itens a serem introduzidos lá." #. (itstool) path: tip/para -#: C/index.docbook:1490 +#: C/index.docbook:1496 msgid "" "Do not create tutorials as extra documents. Just write extra chapters. The " "benefit of directly embedding the tutorial for your library into the API " @@ -2497,7 +2508,7 @@ msgstr "" "atualizações junto com a biblioteca." #. (itstool) path: sect1/para -#: C/index.docbook:1499 +#: C/index.docbook:1505 msgid "" "So what are the things to change inside the master document? For a start is " "only a little. There are some placeholders (text in square brackets) there " @@ -2508,12 +2519,12 @@ msgstr "" "colchetes) que você deve cuidar." #. (itstool) path: example/title -#: C/index.docbook:1506 +#: C/index.docbook:1512 msgid "Master document header" msgstr "Cabeçalho do documento mestre" #. (itstool) path: example/programlisting -#: C/index.docbook:1507 +#: C/index.docbook:1513 #, no-wrap msgid "" "\n" @@ -2543,12 +2554,12 @@ msgstr "" " <title>[Insira o título aqui]</title>\n" #. (itstool) path: sect1/title -#: C/index.docbook:1526 +#: C/index.docbook:1532 msgid "Editing the section file" msgstr "Editando o arquivo de seção" #. (itstool) path: sect1/para -#: C/index.docbook:1528 +#: C/index.docbook:1534 msgid "" "The section file is used to organise the documentation output by GTK-Doc. " "Here one specifies which symbol belongs to which module or class and control " @@ -2559,7 +2570,7 @@ msgstr "" "e controla a visibilidade (pública ou privada)." #. (itstool) path: sect1/para -#: C/index.docbook:1534 +#: C/index.docbook:1540 msgid "" "The section file is a plain text file with XML-like syntax (using tags). " "Blank lines are ignored and lines starting with a '#' are treated as comment " @@ -2570,7 +2581,7 @@ msgstr "" "\" são tratadas como linhas de comentários." #. (itstool) path: sect1/para -#: C/index.docbook:1540 +#: C/index.docbook:1546 msgid "" "The <FILE> ... </FILE> tag is used to specify the file name, " "without any suffix. For example, using '<FILE>gnome-config</" @@ -2593,7 +2604,7 @@ msgstr "" "os caracteres para minúsculos)." #. (itstool) path: sect1/para -#: C/index.docbook:1552 +#: C/index.docbook:1558 msgid "" "The <TITLE> ... </TITLE> tag is used to specify the title of the " "section. It is only useful before the templates (if used) are initially " @@ -2607,7 +2618,7 @@ msgstr "" "obsoleto." #. (itstool) path: sect1/para -#: C/index.docbook:1559 +#: C/index.docbook:1565 msgid "" "You can group items in the section by using the <SUBSECTION> tag. " "Currently it outputs a blank line between subsections in the synopsis " @@ -2636,7 +2647,7 @@ msgstr "" "padrão ou pública depende se há entradas públicas (variáveis, vmethods)." #. (itstool) path: sect1/para -#: C/index.docbook:1578 +#: C/index.docbook:1584 msgid "" "You can also use <INCLUDE> ... </INCLUDE> to specify the " "#include files which are shown in the synopsis sections. It contains a comma-" @@ -2652,12 +2663,12 @@ msgstr "" "aplicar àquela seção." #. (itstool) path: chapter/title -#: C/index.docbook:1592 +#: C/index.docbook:1598 msgid "Controlling the result" msgstr "Controlando o resultado" #. (itstool) path: chapter/para -#: C/index.docbook:1594 +#: C/index.docbook:1600 msgid "" "A GTK-Doc run generates report files inside the documentation directory. The " "generated files are named: <package>-undocumented.txt<package>-undocumented.txt file starts with " "the documentation coverage summary. Below are two sections divided by blank " @@ -2689,7 +2700,7 @@ msgstr "" "exemplo, um novo parâmetro foi adicionado." #. (itstool) path: chapter/para -#: C/index.docbook:1612 +#: C/index.docbook:1618 msgid "" "The <package>-undeclared.txt file lists symbols " "given in the <package>-sections.txt but not found " @@ -2701,7 +2712,7 @@ msgstr "" "escritos incorretamente." #. (itstool) path: chapter/para -#: C/index.docbook:1619 +#: C/index.docbook:1625 msgid "" "The <package>-unused.txt file lists symbol names, " "where the GTK-Doc scanner has found documentation, but does not know where " @@ -2714,7 +2725,7 @@ msgstr "" "ainda ao arquivo <pacote>-sections.txt." #. (itstool) path: tip/para -#: C/index.docbook:1627 +#: C/index.docbook:1633 msgid "" "Enable or add the line in Makefile." "am. If at least GTK-Doc 1.9 is installed, this will run sanity checks during " @@ -2725,7 +2736,7 @@ msgstr "" "verificações de sanidade durante a execução de make check." #. (itstool) path: chapter/para -#: C/index.docbook:1634 +#: C/index.docbook:1640 msgid "" "One can also look at the files produced by the source code scanner: " "<package>-decl-list.txt and <" @@ -2742,7 +2753,7 @@ msgstr "" "este arquivo o contém." #. (itstool) path: chapter/para -#: C/index.docbook:1643 +#: C/index.docbook:1649 msgid "" "If the project is GObject based, one can also look into the files produced " "by the object scanner: <package>.args.txt, " @@ -2763,12 +2774,12 @@ msgstr "" "executando GTK_DOC_KEEP_INTERMEDIATE=1 make." #. (itstool) path: chapter/title -#: C/index.docbook:1658 +#: C/index.docbook:1664 msgid "Modernizing the documentation" msgstr "Modernizando a documentação" #. (itstool) path: chapter/para -#: C/index.docbook:1660 +#: C/index.docbook:1666 msgid "" "GTK-Doc has been around for quite some time. In this section we list new " "features together with the version since when it is available." @@ -2777,12 +2788,12 @@ msgstr "" "funcionalidades juntamente da versão desde a qual está disponível." #. (itstool) path: sect1/title -#: C/index.docbook:1666 +#: C/index.docbook:1672 msgid "GTK-Doc 1.9" msgstr "GTK-Doc 1.9" #. (itstool) path: sect1/para -#: C/index.docbook:1668 +#: C/index.docbook:1674 msgid "" "When using xml instead of sgml, one can actually name the master document " "<package>-docs.xml." @@ -2791,7 +2802,7 @@ msgstr "" "<pacote>-docs.xml." #. (itstool) path: sect1/para -#: C/index.docbook:1673 +#: C/index.docbook:1679 msgid "" "This version supports in " "Makefile.am. When this is enabled, the <" @@ -2812,7 +2823,7 @@ msgstr "" "meld <package>-decl-list.txt <package>-sections.txt." #. (itstool) path: sect1/para -#: C/index.docbook:1684 +#: C/index.docbook:1690 msgid "" "Version 1.8 already introduced the syntax for documenting sections in the " "sources instead of the separate files under --flavour no-tmpl no configure.ac." #. (itstool) path: sect1/title -#: C/index.docbook:1694 +#: C/index.docbook:1700 msgid "GTK-Doc 1.10" msgstr "GTK-Doc 1.10" #. (itstool) path: sect1/para -#: C/index.docbook:1696 +#: C/index.docbook:1702 msgid "" "This version supports in " "Makefile.am. When this is enabled, the <" @@ -2849,17 +2860,17 @@ msgstr "" "código que é compilado condicionalmente." #. (itstool) path: sect1/title -#: C/index.docbook:1707 +#: C/index.docbook:1713 msgid "GTK-Doc 1.16" msgstr "GTK-Doc 1.16" #. (itstool) path: example/title -#: C/index.docbook:1713 +#: C/index.docbook:1719 msgid "Enable gtkdoc-check" msgstr "Habilitar gtkdoc-check" #. (itstool) path: example/programlisting -#: C/index.docbook:1714 +#: C/index.docbook:1720 #, no-wrap msgid "" "\n" @@ -2879,7 +2890,7 @@ msgstr "" "endif\n" #. (itstool) path: sect1/para -#: C/index.docbook:1709 +#: C/index.docbook:1715 msgid "" "This version includes a new tool called gtkdoc-check. This tool can run a " "set of sanity checks on your documentation. It is enabled by adding these " @@ -2891,12 +2902,12 @@ msgstr "" "filename>. <_:example-1/>" #. (itstool) path: sect1/title -#: C/index.docbook:1727 +#: C/index.docbook:1733 msgid "GTK-Doc 1.20" msgstr "GTK-Doc 1.20" #. (itstool) path: sect1/para -#: C/index.docbook:1729 +#: C/index.docbook:1735 msgid "" "Version 1.18 brought some initial markdown support. Using markdown in doc " "comments is less intrusive than writing docbook xml. This version improves a " @@ -2910,12 +2921,12 @@ msgstr "" "comentário tem todos os detalhes." #. (itstool) path: chapter/title -#: C/index.docbook:1740 +#: C/index.docbook:1746 msgid "Documenting other interfaces" msgstr "Documentando outras interfaces" #. (itstool) path: chapter/para -#: C/index.docbook:1742 +#: C/index.docbook:1748 msgid "" "So far we have been using GTK-Doc to document the API of code. The next " "sections contain suggestions how the tools can be used to document other " @@ -2926,13 +2937,13 @@ msgstr "" "para documentar outras interfaces, também." #. (itstool) path: sect1/title -#: C/index.docbook:1749 +#: C/index.docbook:1755 msgid "Command line options and man pages" msgstr "Opções de linha de comando e de páginas man" # RefEntry é uma página de referência do DocBook (http://www.docbook.org/tdg/en/html/refentry.html) #. (itstool) path: sect1/para -#: C/index.docbook:1751 +#: C/index.docbook:1757 msgid "" "As one can generate man pages for a docbook refentry as well, it sounds like " "a good idea to use it for that purpose. This way the interface is part of " @@ -2943,12 +2954,12 @@ msgstr "" "parte da referência e é possível obter a página man de graça." #. (itstool) path: sect2/title -#: C/index.docbook:1758 +#: C/index.docbook:1764 msgid "Document the tool" msgstr "Documentar a ferramenta" #. (itstool) path: sect2/para -#: C/index.docbook:1760 +#: C/index.docbook:1766 msgid "" "Create one refentry file per tool. Following our example we would call it meep/" @@ -2963,17 +2974,17 @@ msgstr "" "assim como exemplos, por exemplo, em glib." #. (itstool) path: sect2/title -#: C/index.docbook:1770 +#: C/index.docbook:1776 msgid "Adding the extra configure check" msgstr "Adicionando a verificação extra ao configure" #. (itstool) path: example/title -#: C/index.docbook:1773 C/index.docbook:1791 +#: C/index.docbook:1779 C/index.docbook:1797 msgid "Extra configure checks" msgstr "Verificações extra no configure" #. (itstool) path: example/programlisting -#: C/index.docbook:1774 +#: C/index.docbook:1780 #, no-wrap msgid "" "\n" @@ -2995,12 +3006,12 @@ msgstr "" "AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)\n" #. (itstool) path: sect2/title -#: C/index.docbook:1788 +#: C/index.docbook:1794 msgid "Adding the extra makefile rules" msgstr "Adicionando as regras extras ao makefile" #. (itstool) path: example/programlisting -#: C/index.docbook:1792 +#: C/index.docbook:1798 #, no-wrap msgid "" "\n" @@ -3036,12 +3047,12 @@ msgstr "" "EXTRA_DIST += meep.xml\n" #. (itstool) path: sect1/title -#: C/index.docbook:1814 +#: C/index.docbook:1820 msgid "DBus interfaces" msgstr "Interfaces DBus" #. (itstool) path: sect1/para -#: C/index.docbook:1816 +#: C/index.docbook:1822 msgid "" "(FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://" "cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)" @@ -3050,27 +3061,27 @@ msgstr "" "http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)" #. (itstool) path: chapter/title -#: C/index.docbook:1825 +#: C/index.docbook:1831 msgid "Frequently asked questions" msgstr "Perguntas frequentes" #. (itstool) path: segmentedlist/segtitle -#: C/index.docbook:1829 +#: C/index.docbook:1835 msgid "Question" msgstr "Questão" #. (itstool) path: segmentedlist/segtitle -#: C/index.docbook:1830 +#: C/index.docbook:1836 msgid "Answer" msgstr "Resposta" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1832 +#: C/index.docbook:1838 msgid "No class hierarchy." msgstr "Sem hierarquia de classe." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1833 +#: C/index.docbook:1839 msgid "" "The objects xxx_get_type() function has not been " "entered into the <package>.types file." @@ -3079,12 +3090,12 @@ msgstr "" "arquivo <pacote>.types." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1839 +#: C/index.docbook:1845 msgid "Still no class hierarchy." msgstr "Ainda sem hierarquia." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1840 +#: C/index.docbook:1846 msgid "" "Missing or wrong naming in <package>-sections.txt " "file (see explicação)." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1846 +#: C/index.docbook:1852 msgid "Damn, I have still no class hierarchy." msgstr "Droga. Eu ainda não tenho hierarquia de classes." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1847 +#: C/index.docbook:1853 msgid "" "Is the object name (name of the instance struct, e.g. GtkWidget) part of the normal section (don't put this into Standard or Private " @@ -3111,12 +3122,12 @@ msgstr "" "subsções Standard ou Private)?" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1854 +#: C/index.docbook:1860 msgid "No symbol index." msgstr "Nenhum símbolo de índice." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1855 +#: C/index.docbook:1861 msgid "" "Does the <package>-docs.{xml,sgml} contain a " "index that xi:includes the generated index?" @@ -3125,12 +3136,12 @@ msgstr "" "\"xi:inclui\" o índice gerado?" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1861 +#: C/index.docbook:1867 msgid "Symbols are not linked to their doc-section." msgstr "Símbolos não estão vinculados ao seus doc-section." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1862 +#: C/index.docbook:1868 msgid "" "Is the doc-comment using the correct markup (added #,% or ())? Check if the " "gtkdoc-fixxref warns about unresolvable xrefs." @@ -3139,12 +3150,12 @@ msgstr "" "Verifique se o gtkdoc-fixxref avisa sobre xrefs não resolvidos." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1868 +#: C/index.docbook:1874 msgid "A new class does not appear in the docs." msgstr "Uma nova classe não aparece nos documentos." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1869 +#: C/index.docbook:1875 msgid "" "Is the new page xi:included from <package>-docs.{xml,sgml}." @@ -3153,12 +3164,12 @@ msgstr "" "?" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1875 +#: C/index.docbook:1881 msgid "A new symbol does not appear in the docs." msgstr "Um novo símbolo não aparece nos documentos." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1876 +#: C/index.docbook:1882 msgid "" "Is the doc-comment properly formatted. Check for spelling mistakes in the " "begin of the comment. Check if the gtkdoc-fixxref warns about unresolvable " @@ -3171,12 +3182,12 @@ msgstr "" "<pacote>-sections.txt em uma subseção pública." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1884 +#: C/index.docbook:1890 msgid "A type is missing from the class hierarchy." msgstr "Um tipo está faltando da hierarquia de classe." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1885 +#: C/index.docbook:1891 msgid "" "If the type is listed in <package>.hierarchy but " "not in xml/tree_index.sgml then double check that the " @@ -3191,13 +3202,13 @@ msgstr "" "listada ou incidentalmente marcada como privada, ela não será mostrada." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1894 +#: C/index.docbook:1900 msgid "I get foldoc links for all gobject annotations." msgstr "" "Obtenho links de seguimento de documentos para todas as anotações gobject." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1895 +#: C/index.docbook:1901 msgid "" "Check that xml/annotation-glossary.xml is xi:included " "from <package>-docs.{xml,sgml}." @@ -3206,12 +3217,12 @@ msgstr "" "incluído\" de <pacote>-docs.{xml,sgml}." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1903 +#: C/index.docbook:1909 msgid "Parameter described in source code comment block but does not exist" msgstr "Parâmetro descrito no bloco de comentário do código fonte não existe" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1904 +#: C/index.docbook:1910 msgid "" "Check if the prototype in the header has different parameter names as in the " "source." @@ -3220,12 +3231,12 @@ msgstr "" "fonte." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1909 +#: C/index.docbook:1915 msgid "multiple \"IDs\" for constraint linkend: XYZ" msgstr "Múltiplos \"IDs\" para restrições do fim do link XYZ" #. (itstool) path: seglistitem/seg -#: C/index.docbook:1910 +#: C/index.docbook:1916 msgid "" "Symbol XYZ appears twice in <package>-sections.txt file." @@ -3234,7 +3245,7 @@ msgstr "" "sections.txt." #. (itstool) path: seglistitem/seg -#: C/index.docbook:1913 +#: C/index.docbook:1919 msgid "" "Element typename in namespace '' encountered in para, but no template " "matches." @@ -3243,12 +3254,12 @@ msgstr "" "correspondeu." #. (itstool) path: chapter/title -#: C/index.docbook:1920 +#: C/index.docbook:1926 msgid "Tools related to gtk-doc" msgstr "Ferramentas relacionadas ao gtk-doc" #. (itstool) path: chapter/para -#: C/index.docbook:1922 +#: C/index.docbook:1928 msgid "" "GtkDocPlugin - a Trac " "GTK-Doc integration plugin, that adds API docs to a trac site and " @@ -3259,7 +3270,7 @@ msgstr "" "a um site trac e integra com a pesquisa do trac." #. (itstool) path: chapter/para -#: C/index.docbook:1927 +#: C/index.docbook:1933 msgid "" "Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since " "tags in the API to determine the minimum required version." diff --git a/help/manual/sl/fdl-appendix.xml b/help/manual/sl/fdl-appendix.xml index 7cf0fc3..8589225 100644 --- a/help/manual/sl/fdl-appendix.xml +++ b/help/manual/sl/fdl-appendix.xml @@ -496,7 +496,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/sl/index.docbook b/help/manual/sl/index.docbook index 8420d42..3726f76 100644 --- a/help/manual/sl/index.docbook +++ b/help/manual/sl/index.docbook @@ -81,11 +81,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -572,12 +578,17 @@ make Integration with version control systems - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -595,9 +606,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -642,7 +653,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -775,12 +795,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -831,16 +856,16 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - As already mentioned earlier GTK-Doc is for documenting public API. Thus - one cannot write documentation for static symbols. Nevertheless it is good - to comment those symbols too. This helps other to understand you code. - Therefore we recommend to comment these using normal comments (without the - 2nd '*' in the first line). - If later the function needs to be made public, all one needs to do is to - add another '*' in the comment block and insert the symbol name at the - right place inside the sections file. - + + As already mentioned earlier GTK-Doc is for documenting public API. Thus + one cannot write documentation for static symbols. Nevertheless it is good + to comment those symbols too. This helps other to understand you code. + Therefore we recommend to comment these using normal comments (without the + 2nd '*' in the first line). + If later the function needs to be made public, all one needs to do is to + add another '*' in the comment block and insert the symbol name at the + right place inside the sections file. + @@ -1042,10 +1067,10 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - (FIXME : Stability information) - - + + (FIXME : Stability information) + + General tags + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Function comment block @@ -1096,13 +1153,6 @@ foo_get_bar(Foo *foo) private. They are treated like static functions. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - Function comment block tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1887,7 +1939,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2430,7 +2482,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/sv/fdl-appendix.xml b/help/manual/sv/fdl-appendix.xml index 101af01..d75087d 100644 --- a/help/manual/sv/fdl-appendix.xml +++ b/help/manual/sv/fdl-appendix.xml @@ -459,7 +459,13 @@ documents in all other respects. - Du äger lyfta ut ett dokument från en sådan samling, och sprida det enskilt under GNU Free Documentation License, förutsatt att du lägger till en kopia av denna licens [den engelska originalversionen] i det utlyfta dokumentet, och följer villkoren för ordagrann kopiering i denna licens för det utlyfta dokumentet i alla andra avseenden. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/sv/index.docbook b/help/manual/sv/index.docbook index 6823a25..02724cf 100644 --- a/help/manual/sv/index.docbook +++ b/help/manual/sv/index.docbook @@ -68,11 +68,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -559,12 +565,17 @@ make Integration with version control systems - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -582,9 +593,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -629,7 +640,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -762,12 +782,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -818,16 +843,16 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - As already mentioned earlier GTK-Doc is for documenting public API. Thus - one cannot write documentation for static symbols. Nevertheless it is good - to comment those symbols too. This helps other to understand you code. - Therefore we recommend to comment these using normal comments (without the - 2nd '*' in the first line). - If later the function needs to be made public, all one needs to do is to - add another '*' in the comment block and insert the symbol name at the - right place inside the sections file. - + + As already mentioned earlier GTK-Doc is for documenting public API. Thus + one cannot write documentation for static symbols. Nevertheless it is good + to comment those symbols too. This helps other to understand you code. + Therefore we recommend to comment these using normal comments (without the + 2nd '*' in the first line). + If later the function needs to be made public, all one needs to do is to + add another '*' in the comment block and insert the symbol name at the + right place inside the sections file. + @@ -1029,10 +1054,10 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - - (FIXME : Stability information) - - + + (FIXME : Stability information) + + General tags + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + Function comment block @@ -1083,13 +1140,6 @@ foo_get_bar(Foo *foo) private. They are treated like static functions. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - Function comment block tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1874,7 +1926,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2128,7 +2180,13 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) 6. SAMLINGAR AV DOKUMENT Du äger skapa en samling bestående av dokumentet och andra dokument som är släppta under GNU Free Documentation License, och ersätta individuella kopior i dokumenten av denna licens med en enda kopia [av den engelska originalversionen] som inkluderas i samlingen, förutsatt att du följer villkoren för ordagrann kopiering i denna licens för varje inkluderat dokument i alla andra avseenden. - Du äger lyfta ut ett dokument från en sådan samling, och sprida det enskilt under GNU Free Documentation License, förutsatt att du lägger till en kopia av denna licens [den engelska originalversionen] i det utlyfta dokumentet, och följer villkoren för ordagrann kopiering i denna licens för det utlyfta dokumentet i alla andra avseenden. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you + insert a copy of this License into the extracted document, and + follow this License in all other respects regarding verbatim + copying of that document. + diff --git a/help/manual/ta/fdl-appendix.xml b/help/manual/ta/fdl-appendix.xml index 57844b2..4e333f5 100644 --- a/help/manual/ta/fdl-appendix.xml +++ b/help/manual/ta/fdl-appendix.xml @@ -489,7 +489,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/ta/index.docbook b/help/manual/ta/index.docbook index 20410a9..ec44daa 100644 --- a/help/manual/ta/index.docbook +++ b/help/manual/ta/index.docbook @@ -68,11 +68,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -478,12 +484,17 @@ make வெர்ஷன் கன்ட்ரோல் அமைப்புகளுடன் ஒருங்கிணைத்தல் - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -501,9 +512,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -539,7 +550,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -662,12 +682,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -718,7 +743,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - ஜிடிகே டாக் + ஜிடிகே டாக் @@ -904,8 +929,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - FIXME : Stability information) - + FIXME : Stability information) + பொது டேக் ஒட்டுகள் + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + பங்ஷன் விமரிசன தொகுதி @@ -956,13 +1013,6 @@ foo_get_bar(Foo *foo) private. They are treated like static functions. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - பங்ஷன் விமரிசன தொகுதி tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1716,7 +1768,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2153,7 +2205,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/te/fdl-appendix.xml b/help/manual/te/fdl-appendix.xml index 7cf0fc3..8589225 100644 --- a/help/manual/te/fdl-appendix.xml +++ b/help/manual/te/fdl-appendix.xml @@ -496,7 +496,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/te/index.docbook b/help/manual/te/index.docbook index a012001..015b8fd 100644 --- a/help/manual/te/index.docbook +++ b/help/manual/te/index.docbook @@ -68,11 +68,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -476,12 +482,17 @@ make వర్షన్ కంట్రోల్ సిస్టమ్‌తో విలీనం - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -499,9 +510,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -537,7 +548,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -660,12 +680,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -716,7 +741,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - ముందుగా చెప్పినట్లుగా GTK-Doc అనునది పబ్లిక్ API పత్రికీకరణ కొరకు. స్థిర చిహ్నములకు వొక్కరే పత్రికీకరణ వ్రాయలేరు. ఆ చిహ్నములను కూడా వ్యాఖ్యానించుట మంచిది. ఇది యితరులు కూడా మీ కోడ్‌ను అర్ధము చేసుకొనుటకు సహాయపడును. అందుకని వీటిని సాదారణ వ్యాఖ్యలు (మొదటి వరుసనందు 2వ '*' లేకుండా) వుపయోగించి వ్యాఖ్యానించమని సూచించడమైంది. తరువాత ఆ ఫంక్షన్ పబ్లిక్‌గా మార్చవలసివుంటే, చేయవలసినదల్లా వేరొక '*'ను వ్యాఖ్య బ్లాక్ నందు చేర్చి మరియు చిహ్నపు నామాన్నివిభగాముల ఫైలునందు సరైన స్థానములో వుంచడమే. + ముందుగా చెప్పినట్లుగా GTK-Doc అనునది పబ్లిక్ API పత్రికీకరణ కొరకు. స్థిర చిహ్నములకు వొక్కరే పత్రికీకరణ వ్రాయలేరు. ఆ చిహ్నములను కూడా వ్యాఖ్యానించుట మంచిది. ఇది యితరులు కూడా మీ కోడ్‌ను అర్ధము చేసుకొనుటకు సహాయపడును. అందుకని వీటిని సాదారణ వ్యాఖ్యలు (మొదటి వరుసనందు 2వ '*' లేకుండా) వుపయోగించి వ్యాఖ్యానించమని సూచించడమైంది. తరువాత ఆ ఫంక్షన్ పబ్లిక్‌గా మార్చవలసివుంటే, చేయవలసినదల్లా వేరొక '*'ను వ్యాఖ్య బ్లాక్ నందు చేర్చి మరియు చిహ్నపు నామాన్నివిభగాముల ఫైలునందు సరైన స్థానములో వుంచడమే. @@ -884,8 +909,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : స్థిరత్వ సమాచారము) - + (FIXME : స్థిరత్వ సమాచారము) + సాధారణ టాగ్లు + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + ఫంక్షన్ వ్యాఖ్యానపు బ్లాక్ @@ -933,13 +990,6 @@ foo_get_bar(Foo *foo) Gtk-doc అన్ని చిహ్నములు (macros, functions) '_'తో ప్రారంభమగునవి వ్యక్తిగతమైనవని పరిగణించును. అవి స్టాటిక్ ఫంక్షన్సు వలె పరిగణించబడును. - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - ఫంక్షన్ వ్యాఖ్యానపు బ్లాక్ tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1716,7 +1768,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2259,7 +2311,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/zh_CN/fdl-appendix.xml b/help/manual/zh_CN/fdl-appendix.xml index c5842ff..1aae724 100644 --- a/help/manual/zh_CN/fdl-appendix.xml +++ b/help/manual/zh_CN/fdl-appendix.xml @@ -496,7 +496,7 @@ You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/help/manual/zh_CN/index.docbook b/help/manual/zh_CN/index.docbook index d17fa33..36467af 100644 --- a/help/manual/zh_CN/index.docbook +++ b/help/manual/zh_CN/index.docbook @@ -46,11 +46,17 @@ - 1.20.1 - 16 Feb 2014 + 1.21.1 + 18 Jul 2014 ss development version + + 1.21 + 17 Jul 2014 + ss + bug fixes, dropping deprecated features + 1.20 16 Feb 2014 @@ -510,12 +516,17 @@ make 与版本控制系统集成 - As a rule of the thumb, it's those files you edit, that should go under + As a rule of thumb, it's the files you edit which should go under version control. For typical projects it's these files: <package>.types, <package>-docs.xml (in the past .sgml), <package>-sections.txt, - Makefile.am + Makefile.am. + + + Files in the xml/ and html/ + directories should not go under version control. Neither should any of + the .stamp files. @@ -533,9 +544,9 @@ make gtkdoc-scangobj --module=$(DOC_MODULE) -gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml +gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --source-dir= // xml files have changed mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) ../meep-docs.xml @@ -568,7 +579,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html The scanner can handle the majority of C headers fine. In the case of receiving warnings from the scanner that look like a special case, one can - hint GTK-Doc to skip over them. + hint GTK-Doc to skip over them. GTK-Doc comment block + + Limitations + + Note, that GTK-Doc's supports + #ifndef(__GTK_DOC_IGNORE__) but not + #if !defined(__GTK_DOC_IGNORE__) or other combinations. + + + @@ -680,12 +700,17 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html appear as lines starting with a dash. + + While markdown is now preferred one can mix both. One limitation here is + that one can use docbook xml within markdown, but markdown within + docbook xml is not supported. + + In older GTK-Doc releases, if you need support for additional formatting, you would need to enable the usage of docbook - SGML/XML tags inside doc-comments by - putting or - in the variable + SGML/XML tags inside doc-comments by putting + or in the variable MKDB_OPTIONS inside Makefile.am. @@ -736,7 +761,7 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - 如早先所述，GTK-Doc是为编写公共的API而作的。所以你不能够为静态符号编写文档。尽管如此，它也可以很好地为那些符号作注释。这有助于他人理解你的代码。因此我们建议你用普通的注释来注释它们（不使用第一行的第二个'*'号）。如果以后函数须要作为public，你须做的只是在注释块中加入另一个 '*'号并且在区段文件里插入正确的标识符名称。 + 如早先所述，GTK-Doc是为编写公共的API而作的。所以你不能够为静态符号编写文档。尽管如此，它也可以很好地为那些符号作注释。这有助于他人理解你的代码。因此我们建议你用普通的注释来注释它们（不使用第一行的第二个'*'号）。如果以后函数须要作为public，你须做的只是在注释块中加入另一个 '*'号并且在区段文件里插入正确的标识符名称。 @@ -894,8 +919,8 @@ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html - (FIXME : 稳定性信息) - + (FIXME : 稳定性信息) + 一般标记 + Annotations + + + Documentation blocks can contain annotation-tags. These tags will be + rendered with tooltips describing their meaning. The tags are used by + gobject-introspection to generate language bindings. A detailed list + of the supported tags can be found on + the wiki. + + + Annotations + + + + 函数注释块 请记得： @@ -933,13 +990,6 @@ foo_get_bar(Foo *foo) Gtk-doc 假定所有以'_'符开头的符号（宏，函数）是私有的并视它们为静态函数。 - - - Also, take a look at GObject Introspection annotation tags: - http://live.gnome.org/GObjectIntrospection/Annotations - - 函数注释块 tmpl. This version adds options to switch the whole doc module to not use the extra tmpl build step at all, by using - in configure.ac. + in configure.ac. If you don't have a tmpl + checked into you source control system and haven't yet switched, just + add the flag to configure.ac and you are done. @@ -1605,7 +1657,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) but not in xml/tree_index.sgml then double check that the type is correctly placed in the <package>-sections.txt. If the type instance (e.g. GtkWidget) is not listed or - incidentialy makred private it will not be shown. + incidentally marked private it will not be shown. @@ -2146,7 +2198,7 @@ http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus) You may extract a single document from such a collection, and - dispbibute it individually under this License, provided you + distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 828104c..d7c043f 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,9 +1324,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1688,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2512,17 +2526,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3258,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3296,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4048,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4347,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/style/style.css b/style/style.css index c141ddd..3675420 100644 --- a/style/style.css +++ b/style/style.css @@ -60,7 +60,7 @@ a:hover div.informaltable table { border-collapse: separate; - border-spacing: 1em 0.5em; + border-spacing: 1em 0.3em; border: none; } @@ -148,6 +148,8 @@ div.table table th h4 { color: #555753; + margin-top: 1em; + margin-bottom: 1em; } hr @@ -166,17 +168,16 @@ dl.toc dt padding-bottom: 0.25em; } -dl.toc > dd > dl > dt +dl.toc > dt { padding-top: 0.25em; padding-bottom: 0.25em; + font-weight: bold; } -dl.toc > dt +dl.toc > dl { - padding-top: 1em; padding-bottom: 0.5em; - font-weight: bold; } .parameter @@ -346,7 +347,9 @@ acronym,abbr } @media screen { - sup a.footnote + /* these have a as a first child, but since there are no parent selectors + * we can't use that. */ + a.footnote { position: relative; top: 0em ! important; diff --git a/tests/Makefile.in b/tests/Makefile.in index 13a31fc..1bbbc96 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/tools.sh.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/tools.sh.in $(top_srcdir)/build-aux/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -47,30 +91,263 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = tools.sh CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -189,6 +466,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -262,6 +541,7 @@ EXTRA_DIST = gtkdoctest.sh tools.sh \ all: all-recursive .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -302,22 +582,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -332,57 +615,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -398,12 +636,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -415,15 +648,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -432,102 +661,229 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +tools.sh.log: tools.sh + @p='tools.sh'; \ + b='tools.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +gobject.sh.log: gobject.sh + @p='gobject.sh'; \ + b='gobject.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +bugs.sh.log: bugs.sh + @p='bugs.sh'; \ + b='bugs.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +annotations.sh.log: annotations.sh + @p='annotations.sh'; \ + b='annotations.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +fail.sh.log: fail.sh + @p='fail.sh'; \ + b='fail.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +empty.sh.log: empty.sh + @p='empty.sh'; \ + b='empty.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +sanity.sh.log: sanity.sh + @p='sanity.sh'; \ + b='sanity.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -561,13 +917,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -613,6 +966,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -689,22 +1045,21 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am # run any given test by running make .check diff --git a/tests/annotations/Makefile.in b/tests/annotations/Makefile.in index 0ac7974..c6a9fbc 100644 --- a/tests/annotations/Makefile.in +++ b/tests/annotations/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/annotations -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,26 +90,58 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -186,6 +262,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -285,22 +363,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -315,57 +396,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -381,12 +417,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +429,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +442,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -451,13 +493,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -580,22 +619,21 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am check-local clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am @BUILD_TESTS_TRUE@check-local: clean diff --git a/tests/annotations/docs/Makefile.in b/tests/annotations/docs/Makefile.in index dc3fe0f..423bb7a 100644 --- a/tests/annotations/docs/Makefile.in +++ b/tests/annotations/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/tests/gtk-doc.notmpl.make +DIST_COMMON = $(top_srcdir)/tests/gtk-doc.notmpl.make \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = tests/annotations/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ @@ -53,14 +97,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -153,6 +209,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -369,11 +427,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -513,17 +571,17 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-libtool clean-local cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic maintainer-clean-local mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am check-local: html-build.stamp pdf-build.stamp diff --git a/tests/annotations/docs/tester-docs.xml b/tests/annotations/docs/tester-docs.xml index b217fbf..4d3e60e 100644 --- a/tests/annotations/docs/tester-docs.xml +++ b/tests/annotations/docs/tester-docs.xml @@ -34,7 +34,7 @@ - + Glossary X diff --git a/tests/annotations/docs/tester-sections.txt b/tests/annotations/docs/tester-sections.txt index f540b9e..81b3ccf 100644 --- a/tests/annotations/docs/tester-sections.txt +++ b/tests/annotations/docs/tester-sections.txt @@ -17,6 +17,8 @@ annotation_skip_return annotation_scope annotation_rename_to stability_unstable +annotation_multiline_on_function +annotation_multiline_on_function2 diff --git a/tests/annotations/src/Makefile.in b/tests/annotations/src/Makefile.in index 218522c..82df052 100644 --- a/tests/annotations/src/Makefile.in +++ b/tests/annotations/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/annotations/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -55,7 +100,20 @@ libtester_la_OBJECTS = $(am_libtester_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = @BUILD_TESTS_TRUE@am_libtester_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -68,22 +126,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtester_la_SOURCES) DIST_SOURCES = $(am__libtester_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -178,6 +254,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -276,12 +354,15 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtester.la: $(libtester_la_OBJECTS) $(libtester_la_DEPENDENCIES) $(EXTRA_libtester_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libtester_la_rpath) $(libtester_la_OBJECTS) $(libtester_la_LIBADD) $(LIBS) @@ -298,14 +379,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -320,26 +401,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -351,15 +421,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -368,6 +434,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -509,18 +590,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff --git a/tests/annotations/src/tester.c b/tests/annotations/src/tester.c index d9d8eba..cf193cf 100644 --- a/tests/annotations/src/tester.c +++ b/tests/annotations/src/tester.c @@ -221,3 +221,22 @@ stability_unstable(void) { } +/** + * annotation_multiline_on_function: (rename-to annotation_scope) + * (skip) + * + * Documentation for this function. + */ +void annotation_multiline_on_function (void) +{ +} + +/** + * annotation_multiline_on_function2: + * (rename-to annotation_scope)(skip) + * + * Documentation for this function. + */ +void annotation_multiline_on_function2 (void) +{ +} \ No newline at end of file diff --git a/tests/annotations/src/tester.h b/tests/annotations/src/tester.h index 677606a..33437dc 100644 --- a/tests/annotations/src/tester.h +++ b/tests/annotations/src/tester.h @@ -37,5 +37,8 @@ void annotation_rename_to (void); void stability_unstable(void); +void annotation_multiline_on_function (void); +void annotation_multiline_on_function2 (void); + #endif // GTKDOC_TESTER_H diff --git a/tests/bugs/Makefile.in b/tests/bugs/Makefile.in index 53b5cc2..b6399db 100644 --- a/tests/bugs/Makefile.in +++ b/tests/bugs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/bugs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,26 +90,58 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -186,6 +262,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -285,22 +363,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -315,57 +396,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -381,12 +417,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +429,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +442,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -451,13 +493,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -580,22 +619,21 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am check-local clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am @BUILD_TESTS_TRUE@check-local: clean diff --git a/tests/bugs/docs/Makefile.in b/tests/bugs/docs/Makefile.in index f6ba0a0..a9d231d 100644 --- a/tests/bugs/docs/Makefile.in +++ b/tests/bugs/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/tests/gtk-doc.notmpl.make +DIST_COMMON = $(top_srcdir)/tests/gtk-doc.notmpl.make \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = tests/bugs/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ @@ -53,14 +97,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -153,6 +209,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -370,11 +428,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -514,17 +572,17 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-libtool clean-local cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic maintainer-clean-local mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am check-local: html-build.stamp pdf-build.stamp diff --git a/tests/bugs/docs/tester-sections.txt b/tests/bugs/docs/tester-sections.txt index 45a56b3..64f62d1 100644 --- a/tests/bugs/docs/tester-sections.txt +++ b/tests/bugs/docs/tester-sections.txt @@ -65,6 +65,8 @@ bug_624001d bug_624001e bug_711598 deprecation_notice +bug_741941 +bug_732689 gst_play_marshal_BUFFER__BOXED @@ -76,5 +78,6 @@ BUG_711598_DEPRECATED_FOR bug_554833_new BUG_731417_DEPRECATED Bug730658 +G_GNUC_NONNULL diff --git a/tests/bugs/src/Makefile.in b/tests/bugs/src/Makefile.in index 65dbf13..1464237 100644 --- a/tests/bugs/src/Makefile.in +++ b/tests/bugs/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/bugs/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -55,7 +100,20 @@ libtester_la_OBJECTS = $(am_libtester_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = @BUILD_TESTS_TRUE@am_libtester_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -68,22 +126,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtester_la_SOURCES) DIST_SOURCES = $(am__libtester_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -178,6 +254,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -276,12 +354,15 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtester.la: $(libtester_la_OBJECTS) $(libtester_la_DEPENDENCIES) $(EXTRA_libtester_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libtester_la_rpath) $(libtester_la_OBJECTS) $(libtester_la_LIBADD) $(LIBS) @@ -298,14 +379,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -320,26 +401,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -351,15 +421,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -368,6 +434,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -509,18 +590,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff --git a/tests/bugs/src/tester.c b/tests/bugs/src/tester.c index 4a281cf..817b6fc 100644 --- a/tests/bugs/src/tester.c +++ b/tests/bugs/src/tester.c @@ -426,3 +426,26 @@ void deprecation_notice(void) { } +/** + * bug_741941: + * @object: the object + * @par: parameter + * + * http://bugzilla.gnome.org/show_bug.cgi?id=741941 + */ +void bug_741941(void *object, void *par) +{ +} + +/** + * bug_732689: + * @spec: the string specifying the color. + * + * Parses a textual specification of a color and fill in the + * red, green, + * and blue fields of a color. + **/ +void +bug_732689 (const gchar *spec) +{ +} \ No newline at end of file diff --git a/tests/bugs/src/tester.h b/tests/bugs/src/tester.h index f75badf..2b680ae 100644 --- a/tests/bugs/src/tester.h +++ b/tests/bugs/src/tester.h @@ -498,6 +498,13 @@ void bug_711598(void); void deprecation_notice(void); #endif +#ifndef G_GNUC_NONNULL +#define G_GNUC_NONNULL(a) +#endif +void bug_741941(void *object, void *par) G_GNUC_NONNULL(1) G_GNUC_NONNULL(2); + +void bug_732689 (const gchar *spec); + /** * BUG_731417_DEPRECATED: * diff --git a/tests/empty/Makefile.in b/tests/empty/Makefile.in index 12ac507..b96b06c 100644 --- a/tests/empty/Makefile.in +++ b/tests/empty/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/empty -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,26 +90,58 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -186,6 +262,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -285,22 +363,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -315,57 +396,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -381,12 +417,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +429,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +442,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -451,13 +493,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -580,22 +619,21 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am check-local clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am @BUILD_TESTS_TRUE@check-local: clean diff --git a/tests/empty/docs/Makefile.in b/tests/empty/docs/Makefile.in index 6b46846..7756019 100644 --- a/tests/empty/docs/Makefile.in +++ b/tests/empty/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/tests/gtk-doc.notmpl.make +DIST_COMMON = $(top_srcdir)/tests/gtk-doc.notmpl.make \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = tests/empty/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ @@ -53,14 +97,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -153,6 +209,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -379,11 +437,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -523,17 +581,17 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-libtool clean-local cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic maintainer-clean-local mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am check-local: html-build.stamp pdf-build.stamp diff --git a/tests/empty/docs/tester-docs.xml b/tests/empty/docs/tester-docs.xml index f5f82df..cbea18a 100644 --- a/tests/empty/docs/tester-docs.xml +++ b/tests/empty/docs/tester-docs.xml @@ -21,7 +21,7 @@ Object Hierarchy - + API Index @@ -31,6 +31,7 @@ Index of deprecated API - + diff --git a/tests/empty/src/Makefile.in b/tests/empty/src/Makefile.in index e8be2f9..139818b 100644 --- a/tests/empty/src/Makefile.in +++ b/tests/empty/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/empty/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -55,7 +100,20 @@ libtester_la_OBJECTS = $(am_libtester_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = @BUILD_TESTS_TRUE@am_libtester_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -68,22 +126,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtester_la_SOURCES) DIST_SOURCES = $(am__libtester_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -178,6 +254,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -276,12 +354,15 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtester.la: $(libtester_la_OBJECTS) $(libtester_la_DEPENDENCIES) $(EXTRA_libtester_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libtester_la_rpath) $(libtester_la_OBJECTS) $(libtester_la_LIBADD) $(LIBS) @@ -298,14 +379,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -320,26 +401,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -351,15 +421,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -368,6 +434,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -509,18 +590,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff --git a/tests/fail/Makefile.in b/tests/fail/Makefile.in index 900f80a..edd602b 100644 --- a/tests/fail/Makefile.in +++ b/tests/fail/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/fail -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,26 +90,58 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -186,6 +262,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -285,22 +363,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -315,57 +396,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -381,12 +417,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +429,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +442,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -451,13 +493,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -580,22 +619,21 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am check-local clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am @BUILD_TESTS_TRUE@check-local: clean diff --git a/tests/fail/docs/Makefile.in b/tests/fail/docs/Makefile.in index c96983d..6cbfdb1 100644 --- a/tests/fail/docs/Makefile.in +++ b/tests/fail/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/tests/gtk-doc.notmpl.make +DIST_COMMON = $(top_srcdir)/tests/gtk-doc.notmpl.make \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = tests/fail/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ @@ -53,14 +97,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -153,6 +209,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -368,11 +426,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -512,17 +570,17 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-libtool clean-local cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic maintainer-clean-local mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am check-local: html-build.stamp pdf-build.stamp diff --git a/tests/fail/src/Makefile.in b/tests/fail/src/Makefile.in index 205541b..6c56e65 100644 --- a/tests/fail/src/Makefile.in +++ b/tests/fail/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/fail/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -55,7 +100,20 @@ libtester_la_OBJECTS = $(am_libtester_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = @BUILD_TESTS_TRUE@am_libtester_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -68,22 +126,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtester_la_SOURCES) DIST_SOURCES = $(am__libtester_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -178,6 +254,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -276,12 +354,15 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtester.la: $(libtester_la_OBJECTS) $(libtester_la_DEPENDENCIES) $(EXTRA_libtester_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libtester_la_rpath) $(libtester_la_OBJECTS) $(libtester_la_LIBADD) $(LIBS) @@ -298,14 +379,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -320,26 +401,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -351,15 +421,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -368,6 +434,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -509,18 +590,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am index da97c39..7eecd38 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = . src docs docs-tmpl +SUBDIRS = . src docs if BUILD_TESTS diff --git a/tests/gobject/Makefile.in b/tests/gobject/Makefile.in index fedeaf6..d665881 100644 --- a/tests/gobject/Makefile.in +++ b/tests/gobject/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/gobject -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -46,26 +90,58 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -186,6 +262,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -243,7 +321,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = . src docs docs-tmpl +SUBDIRS = . src docs EXTRA_DIST = examples/gobject.c all: all-recursive @@ -286,22 +364,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -316,57 +397,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -382,12 +418,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -399,15 +430,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -416,6 +443,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -452,13 +494,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -581,22 +620,21 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am check-local clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am @BUILD_TESTS_TRUE@check-local: clean diff --git a/tests/gobject/docs-tmpl/Makefile.am b/tests/gobject/docs-tmpl/Makefile.am deleted file mode 100644 index 402b0b2..0000000 --- a/tests/gobject/docs-tmpl/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module, e.g. 'glib'. -DOC_MODULE=tester - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -DOC_SOURCE_DIR=$(top_srcdir)/tests/gobject/src - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" - -# Extra options to supply to gtkdoc-mkdb. -MKDB_OPTIONS=--xml-mode - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# --html-dir=$(HTML_DIR) -FIXXREF_OPTIONS=--extra-dir=$(glib_prefix)/share/gtk-doc/html - -# Used for dependencies. The docs will be rebuilt if any of these change. -HFILE_GLOB=$(top_srcdir)/tests/gobject/src/*.h -CFILE_GLOB=$(top_srcdir)/tests/gobject/src/*.c - -# Header files to ignore when scanning. -IGNORE_HFILES=config.h - -# Images to copy into HTML directory. -HTML_IMAGES = \ - $(srcdir)/images/object.png - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files= - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -GTKDOC_CFLAGS = -I$(top_srcdir)/tests/gobject/src $(TEST_DEPS_CFLAGS) -GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/gobject/src/libtester.la - -# include generic part -include $(top_srcdir)/tests/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += tester.types - -DISTCLEANFILES = \ - gtkdoc-scan.log \ - gtkdoc-scangobj.log \ - gtkdoc-mktmpl.log \ - gtkdoc-mkdb.log \ - gtkdoc-mkhtml.log \ - gtkdoc-fixxref.log - -if BUILD_TESTS -TESTS_ENVIRONMENT = \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ - PERL5LIB=$(abs_top_builddir):$(PERL5LIB) -endif - -GITIGNOREFILES = \ - tmpl - --include $(top_srcdir)/git.mk diff --git a/tests/gobject/docs-tmpl/Makefile.in b/tests/gobject/docs-tmpl/Makefile.in deleted file mode 100644 index 4bdcf3b..0000000 --- a/tests/gobject/docs-tmpl/Makefile.in +++ /dev/null @@ -1,716 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/tests/gtk-doc.make -subdir = tests/gobject/docs-tmpl -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ - $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATE_FMT_CMD = @DATE_FMT_CMD@ -DBLATEX = @DBLATEX@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ELAPSED_FMT = @ELAPSED_FMT@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FOP = @FOP@ -GREP = @GREP@ -HELP_DIR = @HELP_DIR@ -HIGHLIGHT = @HIGHLIGHT@ -HIGHLIGHT_OPTIONS = @HIGHLIGHT_OPTIONS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -ITSTOOL = @ITSTOOL@ -JADE = @JADE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PYTHON = @PYTHON@ -PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_PLATFORM = @PYTHON_PLATFORM@ -PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_VERSION = @PYTHON_VERSION@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SGML_FORMAT_TYPE = @SGML_FORMAT_TYPE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TEST_DEPS_CFLAGS = @TEST_DEPS_CFLAGS@ -TEST_DEPS_LIBS = @TEST_DEPS_LIBS@ -TRACE = @TRACE@ -TS_FMT = @TS_FMT@ -VERSION = @VERSION@ -XMLCATALOG = @XMLCATALOG@ -XMLLINT = @XMLLINT@ -XML_CATALOG_FILE = @XML_CATALOG_FILE@ -XSLTPROC = @XSLTPROC@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -glib_prefix = @glib_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgpyexecdir = @pkgpyexecdir@ -pkgpythondir = @pkgpythondir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pyexecdir = @pyexecdir@ -pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module, e.g. 'glib'. -DOC_MODULE = tester - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -DOC_SOURCE_DIR = $(top_srcdir)/tests/gobject/src - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS = - -# Extra options to supply to gtkdoc-scan. -SCAN_OPTIONS = --deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" - -# Extra options to supply to gtkdoc-mkdb. -MKDB_OPTIONS = --xml-mode - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS = - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_OPTIONS = - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# --html-dir=$(HTML_DIR) -FIXXREF_OPTIONS = --extra-dir=$(glib_prefix)/share/gtk-doc/html - -# Used for dependencies. The docs will be rebuilt if any of these change. -HFILE_GLOB = $(top_srcdir)/tests/gobject/src/*.h -CFILE_GLOB = $(top_srcdir)/tests/gobject/src/*.c - -# Header files to ignore when scanning. -IGNORE_HFILES = config.h - -# Images to copy into HTML directory. -HTML_IMAGES = \ - $(srcdir)/images/object.png - - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files = - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -GTKDOC_CFLAGS = -I$(top_srcdir)/tests/gobject/src $(TEST_DEPS_CFLAGS) -GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/gobject/src/libtester.la -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -# we don't install anything in tests -#TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) -SETUP_FILES = \ - $(content_files) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - - -# include generic part - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) tester.types -DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ - html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) -DISTCLEANFILES = \ - gtkdoc-scan.log \ - gtkdoc-scangobj.log \ - gtkdoc-mktmpl.log \ - gtkdoc-mkdb.log \ - gtkdoc-mkhtml.log \ - gtkdoc-fixxref.log - -@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \ -@BUILD_TESTS_TRUE@ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ -@BUILD_TESTS_TRUE@ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ -@BUILD_TESTS_TRUE@ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) - -GITIGNOREFILES = \ - tmpl - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/tests/gtk-doc.make $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/gobject/docs-tmpl/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/gobject/docs-tmpl/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; -$(top_srcdir)/tests/gtk-doc.make: - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-local mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-local - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: check-am install-am install-strip - -.PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am - - -check-local: html-build.stamp pdf-build.stamp - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: All done" - -docs: html-build.stamp pdf-build.stamp - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: All done" - -$(REPORT_FILES): sgml-build.stamp - -ts: - @echo >ts `date $(TS_FMT)`; - -#### setup #### - -setup-build.stamp: ts - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ - done; \ - fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ - fi - @touch setup-build.stamp - -#### scan #### - -scan-build.stamp: ts setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Scanning header files" - @_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - echo "gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)" >gtkdoc-scan.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) 2>&1 | tee -a gtkdoc-scan.log - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Introspecting gobjects"; \ - scanobj_options=""; \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ - echo "gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) $$scanobj_options" >gtkdoc-scangobj.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) $$scanobj_options 2>&1 | tee -a gtkdoc-scangobj.log; \ - else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - @touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Rebuilding template files" - @echo "gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)" >gtkdoc-mktmpl.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) 2>&1 | tee -a gtkdoc-mktmpl.log - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - @touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building XML" - @_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - echo "gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)" >gtkdoc-mkdb.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) 2>&1 | tee -a gtkdoc-mkdb.log - @touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building HTML" - @rm -rf html - @mkdir html - @mkhtml_options=""; \ - if test "x$(V)" = "x1"; then \ - mkhtml_options="$$mkhtml_options --verbose"; \ - fi; \ - echo "gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)" >gtkdoc-mkhtml.log; \ - cd html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \ - gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) 2>&1 | tee -a ../gtkdoc-mkhtml.log - -@test "x$(HTML_IMAGES)" = "x" || \ - for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ - done; - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Fixing cross-references" - @echo "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)" >gtkdoc-fixxref.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) 2>&1 | tee -a gtkdoc-fixxref.log - @touch html-build.stamp - -#### pdf #### - -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building PDF" - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ - if test "x$(V)" = "x1"; then \ - mkpdf_options="$$mkpdf_options --verbose"; \ - fi; \ - if test "x$(HTML_IMAGES)" != "x"; then \ - for img in $(HTML_IMAGES); do \ - part=`dirname $$img`; \ - echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ - if test $$? != 0; then \ - mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ - fi; \ - done; \ - fi; \ - echo "gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)" >gtkdoc-mkpdf.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \ - gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) 2>&1 | tee -a gtkdoc-mkpdf.log - @touch pdf-build.stamp - -############## - -# we need to enforce a rebuild for the tests -clean-local: - @rm -f *~ *.bak ts gtkdoc-*.log - @rm -rf .libs - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ - rm -f $(DOC_MODULE).types; \ - fi - $(MAKE) distclean-local - -distclean-local: - @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ - fi - -maintainer-clean-local: - @rm -rf xml html - -.PHONY : dist-hook-local docs - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/tests/gobject/docs-tmpl/images/object.png b/tests/gobject/docs-tmpl/images/object.png deleted file mode 100644 index b7f45358d48c01237f95f8260b91604e5b1d2740..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4101 zcmaJ^cQhRR*I$XOwaO9_qJFs=q&_6B*Cg{wH48$ zL|-L(PgtV;Ci&w%@B5tdduPtQ-#hnv?wNaMK6B@DBaxa2Dku{a1Oid1sVeCJ>ntDz z5HO$x&~8+~LgJ=_Pyki-v#bFZV5>(6CD6s6Gq1TM8Ss$5P&IY~fyf5`2uXePN-p3e zd#R?OOg2e!jh+##AIyIr1cHUBDaq@3O>WJ2>*?CflI`yFg>XGi<xa8?O!E$l9LOX@V)QZF=>#Dxd zgJWECddvPISWdIcf=_$VdN+bm`W86;ziJ#Ou-koax$^Apt8*;QGfhy$ODQ&A!6MQL zA5ZA?*s5OZCIQF46W)xzVAFiaZN)j)-g5M4Rg0HUn+7CN=gn$Z27oOMWa^hVu$&oXv&daU={!tdt{c}hx}u$Rr;eI}~f=QC0K zsM-f_b!0r`UOx;oYxIz>FpxWNdoJAsTO^}Y;lXFvV|L zn3ynKrK1bn^GR_WuT(}NX>@dTbAKPl382h&4sSo?nV#~TmfSFB1COK!qZ(fFi8)Qa z+TVBW{^9E7>&wZ*Q!*Bid|RU}g->_0K~Q3}NQK-~Ns09I?2ML~nWEV|esB=U#m&vZ z&Ysub@O-Ah-D8f2W$&Ff0t0N^Gx`7u4i1ht8-IGA33#=`!M-oeRv?VhAAJZcwq|%j zVjpRL;+Q)n+k_GU^q|7Px;>nVy1LSOw|hOfyw>m76>U5YJb;5%{f)_*a>YaLP=o<_ zRw00-;QtZAd)6ilM&d9v`wkx;F3ln!auFY2`0?ZL?aPKH+HsgyH=kARR2ENvIC4{M znjmTjq&>>d&mXRF9OptMCME5w|1$IP!f>f2*}N$&W`8jHm=q0>(hXRoEQ+$~z~c)I ztIWmpGatTf>rUi!YJoBTHZB^>qtz;Ib-Q~Yt+S=xg=fvf66unXljnDK2B^KEA?)cX zd^zz5n=6!Tw4sO&0_}g(!d`J)ZpyF}^YgBPfkaxmh>zvy3X{td)X`bN0fM!1cLHQ} z?R?9XJ=vWnC$}Z5PfO?qvyDP}8Uf()%(1<=*#PP%3DtPs?nLl?;V{!D&0#S~zTM6s ze`X~V{{jJJ17WDnX|}7*>&L`!U(N+gOnhv`T|L!9@T;!}&)1NnwH;Uv-^GnxpN+fk z8q*K;+t!~idfylE($Ydo$lEXI*fmxY1VmCj!wkC_knTRL2}(BpVx-U=k6jil8wly; z$`=**9b~P2-KM|t#hMK3wql_}@w1FMP35)MGlO=g%$hBNINyB%`rI=XWjndcN|!U@ zj4q`aJ{ieaE^UZW{!#Ih=IhHKb&{$C4P@=AX^Cw0ec18IEp3kj2s;yjMTjv6YXN)H z)wmr^AKN|0Ku+Wc41Tn;2G2C}(Lz^qF&qcxUU6R;3PQpQ$L+Y}8Hj;GHWuiD35s3l zgsHCLaunMOW+B-6wsVFa+9)aX)ZYzxm|K_-^BU=M(tfga#w&ToM>#Q`Smz6dQul_s zp=o#htXbn9@ z9lGGiDCOMIx$lfSt+pMg_VYO}b4W51(Exkt%_Ln#;kS92HOHl`Y%1%aW<+tQ%b=zV zB-cCg#o8J5NAb82oA>W^Ee;v1Nroa)wfXF8j@WD*w3fEhO?MnidsRcU)2Q8v36jL8 z4d~W)k3wZROP`?j!UW6K1b;9aWh%h$Rv ztne`n5U+Sb>f!AT?dZ|bn~tceiI@E;_YOk~i+8C`_@_}GDOtGYD9qdFL2sq3JwsAe zw4SN{qq1+~Jh&d)XOw03sjo(hl-@ibNS&IPuMNP$-9hLrwSN~@+eL~b2RjFP(?tQw zdp1Na!oVMIkH~ds_>}{$J9oPog=rc)tE}pMFeGQ7_)UhsXPMQZDpMdZv`w_!@*ajl zzB0(j1f-uP49oCY1<}#>yB7zC4Btq~FPLT5+hTvPJxtkE(2FR>d6pIX=K}3cajb*N zN=?8)%> zSo&#daSlgM)jdNC)*vEN%w%HrH+URpN$xMrC~U_G-KUU?y*)s@L`rgevi#uQ*T6C# zN^d^6+#?m4m@A$fo(H9@n#5EZdQJPic{t?ZDBaXchaqxTVk&R*DSX;I+hU_7>8pj} z_AIpLdN$igLSWKP7Umn_Cx&u& zCH5IqRb-?U>sl9M-MeRGtDn3|xD!qChO+00ASeV>C_wer&_m8$MtQGVXsH-fK-+*( zrpcNaEHcYAIpIaU4FBdP$mu+w9`V+jSdv`N+vu|@+{}ZITxG*;dm zfEC{6Y)ugMaPMQj3x_YwT;if_pnJqFQ9n|OOOZ_Bm&{ko%;}zzX{XoqX*tydWXdrTqbub;LqKt8@{b zRAD$xe!C#-cc%;TN^Du3nS0${Lg{qA)E@0Vthbzr9EBy_8oB%;V19HG{wpgaiyx=; z9?1H$^A6&?MYTw94{bA|SV|Q{ym_bqZgn5@?Vf{Eh4ILRm;JQ&(l|;&G{m|@d_A%4 zAT3zC@Pq0PI*OsJmrDe3PP=4CPyfQb6LcC;)FRKz8*7I)%77`FJB&)@bimn+&6U?- zs;CjBbpdO_(o`sG8$9RCes3lBS#2!Be{CJtut+5@g6S#Zbe z!^6XjfQ#^MJc6XRzh6aF6+#KV9Eu-`D>SzT3(3mPK9&`<-3@sBnF0aYzYn)ij=BBWQr5)n8I0=>C=gKXG$j`2a~+z;SwUox^kNV+ z@7P_Iug2OQ;$JgoOp=<^&x|{JG6;w{S#3 z1oxv<%UuEvdqk^w;4@%-UT-b@CP#7juu|si-8s+lq8wgG!X^dAWB$jy^w&9LW@~7-oR7QI9aTT%7x=rwfs+ zt*ue{O#eRE=rfPTS+>dzWXWq9TyHp7#Stc=vQ1V(L0b35V2TeC~%P74`UB7J{!I%;%0TJkHjdK z)!)hIuWqch8({mjK1xw;P+?_96FP1rA}Z=~e(Ig`RP!%gRQkUD^!FQL3RUBa%L8&#eH*muGula9k=THbDg=Ox+twZe z@Iin0AoOc%iXl_nSq#;8g1#=UK`MgXrU*E1yI+)v*C*3EA1P0Mblqr~`t`<3D~BSz21kD=K=G z{n#$$A$L=AGtjME%GCZ<5^bp6N^zTTZ&ujtrVcxf|`VDhAt$7Z_P*1`77RM81xI7LQA-mVe1>VTBr6h8$uvx(aEcf{Nfwd^rI zP2$2?3Q4=j=~8#BpQ%3`7`f|`-Y8QzWUu2}Eb^BBkAW&a7f^Q^Nb&+|bOZNvI9Ag9 fYxJcx#s`upKvhkg4WMbjj1E#$)>NugunhSR4a&wV diff --git a/tests/gobject/docs-tmpl/tester-docs.xml b/tests/gobject/docs-tmpl/tester-docs.xml deleted file mode 100644 index fc620bf..0000000 --- a/tests/gobject/docs-tmpl/tester-docs.xml +++ /dev/null @@ -1,102 +0,0 @@ - - -]> - - - tester Reference Manual - - for tester [VERSION]. - The latest version of this documentation can be found on-line at - http://[SERVER]/tester/. - - - - - Introduction - - This document is for testing purpose only. - It is generated from Docbook-XML. - - - - - Overview - - How to build the library - - - - - - API Reference - - Tests - - - - - - - - - - - Appendix - - - Object Hierarchy - - - - - Object Index - - - - - API Index - - - - Index of deprecated API - - - - Index of new API in 0.1 - - - - Index of new API in 0.5 - - - - - Glossary - A - - API - - Application Programming Interface - - - - X - - XML - - Extensible Markup Language - - - - XSL - - XML Stylesheet Language - - - - - - diff --git a/tests/gobject/docs-tmpl/tester-sections.txt b/tests/gobject/docs-tmpl/tester-sections.txt deleted file mode 100644 index 881bf96..0000000 --- a/tests/gobject/docs-tmpl/tester-sections.txt +++ /dev/null @@ -1,79 +0,0 @@ -
-object -GtkdocObject -GtkdocObjectClass -gtkdoc_object_new -gtkdoc_object_set_otest -gtkdoc_object_frobnicate -gtkdoc_object_fooify -gtkdoc_object_do_not_use -GTKDOC_OBJECT_MACRO_DUMMY -GTKDOC_OBJECT_MACRO_SUM - -GTKDOC_OBJECT -GTKDOC_IS_OBJECT -GTKDOC_TYPE_OBJECT -gtkdoc_object_get_type -GTKDOC_OBJECT_CLASS -GTKDOC_IS_OBJECT_CLASS -GTKDOC_OBJECT_GET_CLASS -
- -
-object2 -GtkdocObject2 -GtkdocObject2Class - -GTKDOC_TYPE_OBJECT2 -gtkdoc_object2_get_type -
- -
-object3 - -GtkdocObject3 -GtkdocObject3Class -GTKDOC_TYPE_OBJECT3 -gtkdoc_object3_get_type -
- -
-iface -GtkdocIface -GtkdocIfaceInterface -gtkdoc_iface_configure -GTKDOC_IFACE_MACRO_DUMMY -GTKDOC_IFACE_MACRO_SUM - -GTKDOC_IFACE -GTKDOC_IS_IFACE -GTKDOC_TYPE_IFACE -gtkdoc_iface_get_type -GTKDOC_IFACE_GET_INTERFACE -
- -
-iface2 -GtkdocIface2 - -GTKDOC_TYPE_IFACE2 -gtkdoc_iface2_get_type -
- -
-types -GtkdocEnum -GtkdocEnum2 -GtkdocPlainOldData -GtkdocBoxedPlainOldData - -GTKDOC_TYPE_ENUM -GTKDOC_TYPE_ENUM2 -GTKDOC_TYPE_BOXED -gtkdoc_enum_get_type -gtkdoc_enum2_get_type -gtkdoc_boxed_get_type -GTKDOC_TYPE_BOXED_PLAIN_OLD_DATA -gtkdoc_boxed_plain_old_data_get_type -
- diff --git a/tests/gobject/docs-tmpl/tester.types b/tests/gobject/docs-tmpl/tester.types deleted file mode 100644 index a39ff85..0000000 --- a/tests/gobject/docs-tmpl/tester.types +++ /dev/null @@ -1,8 +0,0 @@ -#include - -gtkdoc_object_get_type -gtkdoc_object2_get_type -gtkdoc_iface_get_type -gtkdoc_iface2_get_type -gtkdoc_enum_get_type -gtkdoc_boxed_get_type diff --git a/tests/gobject/docs/Makefile.in b/tests/gobject/docs/Makefile.in index 021b540..93418e3 100644 --- a/tests/gobject/docs/Makefile.in +++ b/tests/gobject/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/tests/gtk-doc.notmpl.make +DIST_COMMON = $(top_srcdir)/tests/gtk-doc.notmpl.make \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = tests/gobject/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ @@ -53,14 +97,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -153,6 +209,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -371,11 +429,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -515,17 +573,17 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-libtool clean-local cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic maintainer-clean-local mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am check-local: html-build.stamp pdf-build.stamp diff --git a/tests/gobject/docs/tester-docs.xml b/tests/gobject/docs/tester-docs.xml index 13883f2..9bbdaaa 100644 --- a/tests/gobject/docs/tester-docs.xml +++ b/tests/gobject/docs/tester-docs.xml @@ -111,5 +111,7 @@ + + diff --git a/tests/gobject/src/Makefile.in b/tests/gobject/src/Makefile.in index 34bf07f..2872830 100644 --- a/tests/gobject/src/Makefile.in +++ b/tests/gobject/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tests/gobject/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -57,7 +102,20 @@ libtester_la_OBJECTS = $(am_libtester_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = @BUILD_TESTS_TRUE@am_libtester_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -70,22 +128,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtester_la_SOURCES) DIST_SOURCES = $(am__libtester_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -180,6 +256,8 @@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ XSLTPROC = @XSLTPROC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -283,12 +361,15 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtester.la: $(libtester_la_OBJECTS) $(libtester_la_DEPENDENCIES) $(EXTRA_libtester_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libtester_la_rpath) $(libtester_la_OBJECTS) $(libtester_la_LIBADD) $(LIBS) @@ -307,14 +388,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -329,26 +410,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -360,15 +430,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -377,6 +443,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -518,18 +599,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff --git a/tests/gobject/src/gobject.c b/tests/gobject/src/gobject.c index 7679562..67ccf51 100644 --- a/tests/gobject/src/gobject.c +++ b/tests/gobject/src/gobject.c @@ -95,7 +95,7 @@ * * - A list * - * - Inside markup + * - that is not recognised as markdown * * * @@ -155,7 +155,7 @@ /** * SECTION:object3 * @title: GtkdocObject3 - * @short_description: class that is mostly undocuemnted + * @short_description: class that is mostly undocumented * * This file contains non-sense code for the sole purpose of testing the docs. */ @@ -352,15 +352,14 @@ static void gtkdoc_object_class_init (GtkdocObjectClass *klass) { #endif /** - * GtkdocObject:otest: + * GtkdocObject:otest: (type GList(GtkdocObject2)) * * Since: 0.1 */ g_object_class_install_property (gobject_class,GTKDOC_OBJECT_TEST, - g_param_spec_string ("otest", + g_param_spec_pointer ("otest", "otest prop", "dummy property for object", - "dummy", /* default value */ G_PARAM_READWRITE)); /** diff --git a/tests/gobject/src/gtypes.h b/tests/gobject/src/gtypes.h index f826c38..20a7766 100644 --- a/tests/gobject/src/gtypes.h +++ b/tests/gobject/src/gtypes.h @@ -14,7 +14,7 @@ * GtkdocEnum: * @GTKDOC_ENUM_V1: first * @GTKDOC_ENUM_V2: second - * Since: 0.10 + * Since: 0.5 * * Enum values for the #GtkdocEnum type. */ diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make deleted file mode 100644 index 8cb070c..0000000 --- a/tests/gtk-doc.make +++ /dev/null @@ -1,233 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = $(LIBTOOL) --mode=execute -else -GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -# we don't install anything in tests -#TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -SETUP_FILES = \ - $(content_files) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -EXTRA_DIST = \ - $(HTML_IMAGES) \ - $(SETUP_FILES) - -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ - html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -check-local: html-build.stamp pdf-build.stamp - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: All done" - -docs: html-build.stamp pdf-build.stamp - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: All done" - -$(REPORT_FILES): sgml-build.stamp - -ts: - @echo >ts `date $(TS_FMT)`; - -#### setup #### - -setup-build.stamp: ts - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ - done; \ - fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ - fi - @touch setup-build.stamp - -#### scan #### - -scan-build.stamp: ts setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Scanning header files" - @_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - echo "gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)" >gtkdoc-scan.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) 2>&1 | tee -a gtkdoc-scan.log - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Introspecting gobjects"; \ - scanobj_options=""; \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ - echo "gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) $$scanobj_options" >gtkdoc-scangobj.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) $$scanobj_options 2>&1 | tee -a gtkdoc-scangobj.log; \ - else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - @touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Rebuilding template files" - @echo "gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)" >gtkdoc-mktmpl.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) 2>&1 | tee -a gtkdoc-mktmpl.log - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - @touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building XML" - @_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - echo "gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)" >gtkdoc-mkdb.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) 2>&1 | tee -a gtkdoc-mkdb.log - @touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building HTML" - @rm -rf html - @mkdir html - @mkhtml_options=""; \ - if test "x$(V)" = "x1"; then \ - mkhtml_options="$$mkhtml_options --verbose"; \ - fi; \ - echo "gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)" >gtkdoc-mkhtml.log; \ - cd html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \ - gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) 2>&1 | tee -a ../gtkdoc-mkhtml.log - -@test "x$(HTML_IMAGES)" = "x" || \ - for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ - done; - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Fixing cross-references" - @echo "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)" >gtkdoc-fixxref.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ - gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) 2>&1 | tee -a gtkdoc-fixxref.log - @touch html-build.stamp - -#### pdf #### - -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ - echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building PDF" - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ - if test "x$(V)" = "x1"; then \ - mkpdf_options="$$mkpdf_options --verbose"; \ - fi; \ - if test "x$(HTML_IMAGES)" != "x"; then \ - for img in $(HTML_IMAGES); do \ - part=`dirname $$img`; \ - echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ - if test $$? != 0; then \ - mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ - fi; \ - done; \ - fi; \ - echo "gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)" >gtkdoc-mkpdf.log; \ - PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \ - gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) 2>&1 | tee -a gtkdoc-mkpdf.log - @touch pdf-build.stamp - -############## - -# we need to enforce a rebuild for the tests -clean-local: - @rm -f *~ *.bak ts gtkdoc-*.log - @rm -rf .libs - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ - rm -f $(DOC_MODULE).types; \ - fi - $(MAKE) distclean-local - -distclean-local: - @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ - fi - -maintainer-clean-local: - @rm -rf xml html - -.PHONY : dist-hook-local docs diff --git a/tests/tools.sh b/tests/tools.sh index f1ee7ad..01e2d6c 100755 --- a/tests/tools.sh +++ b/tests/tools.sh @@ -10,7 +10,7 @@ echo "Running suite(s): gtk-doc-$suite"; # we can use which here as we override the path in TEST_ENVIRONMENT # test perl scripts -for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj gtkdoc-scanobj ; do +for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do /usr/bin/perl -cwT `which $file` if test $? = 1 ; then failed=`expr $failed + 1`; fi tested=`expr $tested + 1` diff --git a/tests/tools.sh.in b/tests/tools.sh.in index 28ba163..d331f52 100644 --- a/tests/tools.sh.in +++ b/tests/tools.sh.in @@ -10,7 +10,7 @@ echo "Running suite(s): gtk-doc-$suite"; # we can use which here as we override the path in TEST_ENVIRONMENT # test perl scripts -for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj gtkdoc-scanobj ; do +for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do @PERL@ -cwT `which $file` if test $? = 1 ; then failed=`expr $failed + 1`; fi tested=`expr $tested + 1` -- 2.34.1
- - -

- - - -

- - -

- - - - - - - - -

- - -

+ + +

+ + + +

+ + +

+ + + + + + + + +

+ + +