diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-06 12:40:57 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-06 12:40:57 +0100 |
| commit | 08bc15ac99d9b6224bee7f585101261a1f913f21 (patch) | |
| tree | 851db8fd9090f7c54f7f9d8efa72a47862c1d84f | |
| parent | a3e12d60e406d75ba073c879c8f8b343eacfa9fc (diff) | |
| parent | a980309f0ab1f1f8a94444c82cc1539c11ec73f8 (diff) | |
Merge branch 'telepathy-glib-0.8' into telepathy-glib-0.10
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 17 |
2 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index d3882c950..05db4b455 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,8 @@ TP_COMPILER_WARNINGS([ERROR_CFLAGS], [test "x$official_release" = xno], format-security \ init-self], [missing-field-initializers \ - unused-parameter]) + unused-parameter \ + deprecated-declarations]) AC_SUBST([ERROR_CFLAGS]) AM_CONDITIONAL([OFFICIAL_RELEASE], [test "x$official_release" = xyes]) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 8ad310f18..354bf84b2 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -91,20 +91,3 @@ GTKDOC_LIBS=@DBUS_LIBS@ @GLIB_LIBS@ \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make - -if ENABLE_GTK_DOC -check-local: - @if grep '^0 symbols incomplete' \ - $(srcdir)/telepathy-glib-undocumented.txt; then\ - :; else \ - cat $(srcdir)/telepathy-glib-undocumented.txt; exit 1; fi - @if grep '^0 not documented' \ - $(srcdir)/telepathy-glib-undocumented.txt; then\ - :; else \ - cat $(srcdir)/telepathy-glib-undocumented.txt; exit 1; fi - @if grep . $(srcdir)/telepathy-glib-unused.txt; then\ - echo "^^^ Unused symbols" >&2; exit 1; fi - @if test -e $(srcdir)/telepathy-glib-undeclared.txt &&\ - grep . $(srcdir)/telepathy-glib-undeclared.txt; then\ - echo "^^^ Undeclared symbols" >&2; exit 1; fi -endif |