Skip to content
Snippets Groups Projects
Commit 917f53b1 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Build doc by default, simplify autoconf code 

Fix problems in dbus introspection xml
parent e7ab3c1a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+ 7
− 7
View file @ 917f53b1
...@@ -627,7 +627,7 @@ ...@@ -627,7 +627,7 @@
</arg> </arg>
</method> </method>
<method name="setAudioRingtoneDevice" tp:name-for-binding="setAudioRingtoneDevice"> <method name="setAudioRingtoneDevice" tp:name-for-bindings="setAudioRingtoneDevice">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="in"> <arg type="i" name="index" direction="in">
...@@ -688,7 +688,7 @@ ...@@ -688,7 +688,7 @@
</arg> </arg>
</method> </method>
<method name="setNoiseSuppressState" tp:name-for-binding="setNoiseSuppressState"> <method name="setNoiseSuppressState" tp:name-for-bindings="setNoiseSuppressState">
<arg type="s" name="state" direction="in"> <arg type="s" name="state" direction="in">
</arg> </arg>
</method> </method>
...@@ -702,12 +702,12 @@ ...@@ -702,12 +702,12 @@
</arg> </arg>
</method> </method>
<method name="setEchoCancelState" tp:name-for-binding="setEchoCancelState"> <method name="setEchoCancelState" tp:name-for-bindings="setEchoCancelState">
<arg type="s" name="state" direction="in"> <arg type="s" name="state" direction="in">
</arg> </arg>
</method> </method>
<method name="setEchoCancelTailLength" tp:name-for-binding="setEchoCancelTailLength"> <method name="setEchoCancelTailLength" tp:name-for-bindings="setEchoCancelTailLength">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="in"> <arg type="i" name="index" direction="in">
...@@ -716,7 +716,7 @@ ...@@ -716,7 +716,7 @@
</arg> </arg>
</method> </method>
<method name="getEchoCancelTailLength" tp:name-for-binding="getEchoCancelTailLength"> <method name="getEchoCancelTailLength" tp:name-for-bindings="getEchoCancelTailLength">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="out"> <arg type="i" name="index" direction="out">
...@@ -725,14 +725,14 @@ ...@@ -725,14 +725,14 @@
</arg> </arg>
</method> </method>
<method name="setEchoCancelDelay" tp:name-for-binding="setEchoCancelTailLength"> <method name="setEchoCancelDelay" tp:name-for-bindings="setEchoCancelDelay">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="in"> <arg type="i" name="index" direction="in">
</arg> </arg>
</method> </method>
<method name="getEchoCancelDelay" tp:name-for-binding="getEchoCancelTailLength"> <method name="getEchoCancelDelay" tp:name-for-bindings="getEchoCancelDelay">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="out"> <arg type="i" name="index" direction="out">
......
sflphone-common/Makefile.am
+ 2
− 7
View file @ 917f53b1
...@@ -18,13 +18,8 @@ unittest: ...@@ -18,13 +18,8 @@ unittest:
@echo " -- You need the cppunit devel package to compile the unitary tests." @echo " -- You need the cppunit devel package to compile the unitary tests."
endif endif
doc:
@(cd doc; make)
@echo ""
@echo "D-Bus API HTML documentation has been generated in doc/dbus-api/doc/spec"
@echo ""
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones man $(TESTS_DIR) SUBDIRS = libs src ringtones man $(TESTS_DIR) doc
EXTRA_DIST = m4/*.m4 images/* README.gentoo EXTRA_DIST = m4/*.m4 images/* README.gentoo
sflphone-common/configure.ac
+ 4
− 26
View file @ 917f53b1
...@@ -420,36 +420,14 @@ AC_DEFUN([BB_ENABLE_DOXYGEN], ...@@ -420,36 +420,14 @@ AC_DEFUN([BB_ENABLE_DOXYGEN],
[ [
AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)])
AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)])
AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes]) if test "x$enable_doxygen" != xno; then
AC_ARG_ENABLE(latex-docs, [ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])
if test "x$enable_doxygen" = xno; then
enable_doc=no
else
AC_PATH_PROG(DOXYGEN, doxygen, , $PATH) AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
if test x$DOXYGEN = x; then test x$DOXYGEN = x -a "x$enable_doxygen" = xyes && AC_MSG_ERROR([could not find doxygen])
if test "x$enable_doxygen" = xyes; then
AC_MSG_ERROR([could not find doxygen])
fi
enable_doc=no
else
enable_doc=yes
AC_PATH_PROG(DOT, dot, , $PATH) AC_PATH_PROG(DOT, dot, , $PATH)
fi fi
fi AM_CONDITIONAL(ENABLE_DOXYGEN, test x$DOXYGEN != x)
AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
if test x$DOT = x; then test x$DOT = x -a "x$enable_dot" = xyes && AC_MSG_ERROR([could not find dot])
if test "x$enable_dot" = xyes; then
AC_MSG_ERROR([could not find dot])
fi
enable_dot=no
else
enable_dot=yes
fi
AM_CONDITIONAL(ENABLE_DOXYGEN, test x$enable_doc = xtrue)
AC_SUBST(enable_dot)
AC_SUBST(enable_html_docs)
AC_SUBST(enable_latex_docs)
]) ])
# Acutally perform the doxygen check # Acutally perform the doxygen check
BB_ENABLE_DOXYGEN BB_ENABLE_DOXYGEN
......
sflphone-common/doc/doxygen/Makefile.am
+ 1
− 1
View file @ 917f53b1
...@@ -14,7 +14,7 @@ all: doxygen-trac ...@@ -14,7 +14,7 @@ all: doxygen-trac
doxygen-trac: clean core-doc-trac gtk-gui-doc-trac doxygen-trac: clean core-doc-trac gtk-gui-doc-trac
%-doc-trac : %-doc %-doc-trac : %-doc
ln -s ${html_parent_dir}/$< ${html_parent_dir}/$</html ln -sf ${html_parent_dir}/$< ${html_parent_dir}/$</html
doc: clean core-doc gtk-gui-doc doc: clean core-doc gtk-gui-doc
......
sflphone-common/src/dbus/configurationmanager-introspec.xml
+ 12
− 8
View file @ 917f53b1
...@@ -627,7 +627,7 @@ ...@@ -627,7 +627,7 @@
</arg> </arg>
</method> </method>
<method name="setAudioRingtoneDevice" tp:name-for-binding="setAudioRingtoneDevice"> <method name="setAudioRingtoneDevice" tp:name-for-bindings="setAudioRingtoneDevice">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="in"> <arg type="i" name="index" direction="in">
...@@ -688,8 +688,12 @@ ...@@ -688,8 +688,12 @@
</arg> </arg>
</method> </method>
<method name="setNoiseSuppressState" tp:name-for-binding="setNoiseSuppressState"> <method name="setNoiseSuppressState" tp:name-for-bindings="setNoiseSuppressState">
<tp:docstring>
</tp:docstring>
<arg type="s" name="state" direction="in"> <arg type="s" name="state" direction="in">
<tp:docstring>
</tp:docstring>
</arg> </arg>
</method> </method>
...@@ -702,12 +706,12 @@ ...@@ -702,12 +706,12 @@
</arg> </arg>
</method> </method>
<method name="setEchoCancelState" tp:name-for-binding="setEchoCancelState"> <method name="setEchoCancelState" tp:name-for-bindings="setEchoCancelState">
<arg type="s" name="state" direction="in"> <arg type="s" name="state" direction="in">
</arg> </arg>
</method> </method>
<method name="setEchoCancelTailLength" tp:name-for-binding="setEchoCancelTailLength"> <method name="setEchoCancelTailLength" tp:name-for-bindings="setEchoCancelTailLength">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="in"> <arg type="i" name="index" direction="in">
...@@ -716,7 +720,7 @@ ...@@ -716,7 +720,7 @@
</arg> </arg>
</method> </method>
<method name="getEchoCancelTailLength" tp:name-for-binding="getEchoCancelTailLength"> <method name="getEchoCancelTailLength" tp:name-for-bindings="getEchoCancelTailLength">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="out"> <arg type="i" name="index" direction="out">
...@@ -725,14 +729,14 @@ ...@@ -725,14 +729,14 @@
</arg> </arg>
</method> </method>
<method name="setEchoCancelDelay" tp:name-for-binding="setEchoCancelTailLength"> <method name="setEchoCancelDelay" tp:name-for-bindings="setEchoCancelDelay">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="in"> <arg type="i" name="index" direction="in">
</arg> </arg>
</method> </method>
<method name="getEchoCancelDelay" tp:name-for-binding="getEchoCancelTailLength"> <method name="getEchoCancelDelay" tp:name-for-bindings="getEchoCancelDelay">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
<arg type="i" name="index" direction="out"> <arg type="i" name="index" direction="out">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment