diff options
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | configure.ac | 42 | ||||
| -rw-r--r-- | doc/reference.doxygen.in | 2 | ||||
| -rw-r--r-- | raul/AtomLiblo.hpp | 12 | ||||
| -rw-r--r-- | raul/AtomRDF.hpp | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
6 files changed, 74 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 0bab37c..33a850c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,17 @@ -SUBDIRS = raul src doc +if HAVE_DOXYGEN +DOC_DIR = doc +dist-check-doxygen: +else +DOC_DIR = +dist-check-doxygen: + @echo + @echo ' ******' You need doxygen installed to make dist.' ******' + @echo + @false +endif + +SUBDIRS = raul src $(DOC_DIR) +DIST_SUBDIRS = raul src tests doc if BUILD_UNIT_TESTS SUBDIRS += tests @@ -7,5 +20,7 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = raul.pc +dist-hook: dist-check-doxygen + docs: cd doc && make docs diff --git a/configure.ac b/configure.ac index ae83fe6..cdb362a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([raul],[svn],[dave@drobilla.net]) +AC_INIT([raul],[0.4.0],[dave@drobilla.net]) AC_CONFIG_AUX_DIR([config]) @@ -14,6 +14,31 @@ AC_CONFIG_HEADER([config/config.h]) AM_INIT_AUTOMAKE +# Raul interface version (libtool shared library versioning) +# +# current = incremented whenever the public API is changed +# revision = incremented when the implementation of current is changed +# age = current library is both source and binary compatible with +# interfaces: current,current-1,...,current-age +# +# See libtool documentation for detailed documentation +# +# Version history: +# 0.4.0 = 0,0,0 + +RAUL_VERSION="0.4.0" +RAUL_API_CURRENT="0" +RAUL_API_REVISION="0" +RAUL_API_AGE="0" + +AC_SUBST(RAUL_API_CURRENT) +AC_SUBST(RAUL_API_REVISION) +AC_SUBST(RAUL_API_AGE) +RAUL_SO_VERSION="${RAUL_API_CURRENT}:${RAUL_API_REVISION}:${RAUL_API_AGE}" +AC_SUBST(RAUL_SO_VERSION) +AC_SUBST(RAUL_VERSION) + + #################### ENVIRONMENT AC_LANG([C++]) @@ -40,8 +65,10 @@ cd $builddir RAUL_CFLAGS="-I$abs_srcdir" RAUL_LIBS="$builddir/src/.libs/libraul.la" +RAUL_SRCDIR="$abs_srcdir" AC_SUBST(RAUL_CFLAGS) AC_SUBST(RAUL_LIBS) +AC_SUBST(RAUL_SRCDIR) CONFIG_H_PATH="$builddir/config/config.h" @@ -131,6 +158,18 @@ else AC_MSG_WARN([LASH not found, session support will not be built.]) fi +# Build documentation +build_documentation="yes" +AC_ARG_ENABLE(documentation, + [AS_HELP_STRING(--enable-documentation, [Build documentation (no)])], + [build_documentation="$enableval"]) +AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) +if test $HAVE_DOXYGEN = "false"; then + AC_MSG_WARN([*** Doxygen not found, API documentation will not be built]) + build_documentation="no" +fi +AM_CONDITIONAL(HAVE_DOXYGEN, [test "x$build_documentation" = "xyes"]) + # Build unit tests build_unit_tests="no" AC_ARG_ENABLE(unit-tests, @@ -166,7 +205,6 @@ AC_MSG_RESULT([Configuration:]) AC_MSG_RESULT([]) AC_MSG_RESULT([Jack support: $build_jack]) AC_MSG_RESULT([LASH support: $build_lash]) -AC_MSG_RESULT([RDF support: $build_redlandmm]) AC_MSG_RESULT([Build unit tests: $build_unit_tests]) AC_MSG_RESULT([]) AC_MSG_RESULT([C FLAGS: $CFLAGS]) diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in index 160f233..f01c914 100644 --- a/doc/reference.doxygen.in +++ b/doc/reference.doxygen.in @@ -283,7 +283,7 @@ EXTRACT_ANON_NSPACES = NO # various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. -HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. diff --git a/raul/AtomLiblo.hpp b/raul/AtomLiblo.hpp index 3491b3a..682026a 100644 --- a/raul/AtomLiblo.hpp +++ b/raul/AtomLiblo.hpp @@ -15,11 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/** @file Conversion from Raul Atom to Liblo OSC arguments and vice-versa. - * This header depends on liblo, only apps which directly depend on - * both raul and liblo should include it. - */ - #ifndef RAUL_ATOM_LIBLO_HPP #define RAUL_ATOM_LIBLO_HPP @@ -27,8 +22,14 @@ #include <raul/Atom.hpp> namespace Raul { + +/** Conversion between Raul Atoms and Liblo OSC arguments. + * This code (in header raul/AtomLiblo.hpp) depends on liblo, only apps which + * directly depend on both raul and liblo should include it. + */ namespace AtomLiblo { +/** Append a Raul Atom as a parameter to a liblo message */ inline void lo_message_add_atom(lo_message m, const Atom& atom) { @@ -54,6 +55,7 @@ lo_message_add_atom(lo_message m, const Atom& atom) } +/** Convert a liblo argument to a Raul::Atom */ inline Atom lo_arg_to_atom(char type, lo_arg* arg) { diff --git a/raul/AtomRDF.hpp b/raul/AtomRDF.hpp index 2934a2a..53fd67d 100644 --- a/raul/AtomRDF.hpp +++ b/raul/AtomRDF.hpp @@ -15,11 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/** @file Conversion from Raul Atom to Redlandmm RDF Node and vice-versa. - * This header depends on redlandmm, only apps which directly depend on - * both raul and redlandmm should include it. - */ - #ifndef RAUL_ATOM_RDF_HPP #define RAUL_ATOM_RDF_HPP @@ -35,8 +30,14 @@ #define CUC(x) ((const unsigned char*)(x)) namespace Raul { + +/** Conversion between Raul Atoms and Redlandmm RDF nodes. + * This code (in header raul/AtomRDF.hpp) depends on redlandmm, only apps + * which directly depend on both raul and liblo should include it. + */ namespace AtomRDF { +/** Convert a Redland::Node to a Raul::Atom */ inline Atom node_to_atom(const Redland::Node& node) { @@ -53,6 +54,7 @@ node_to_atom(const Redland::Node& node) } +/** Convert a Raul::Atom to a Redland::Node */ inline Redland::Node atom_to_node(Redland::World& world, const Atom& atom) { diff --git a/src/Makefile.am b/src/Makefile.am index 0f0e58d..57e5152 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,6 @@ -libraul_la_CXXFLAGS = @RAUL_CFLAGS@ @REDLANDMM_CFLAGS@ @GLIBMM_CFLAGS@ @GTHREAD_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ -libraul_la_LIBADD = @REDLANDMM_LIBS@ @GLIBMM_LIBS@ @GTHREAD_LIBS@ @JACK_LIBS@ @LASH_LIBS@ +libraul_la_CXXFLAGS = @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ @GTHREAD_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ +libraul_la_LIBADD = @GLIBMM_LIBS@ @GTHREAD_LIBS@ @JACK_LIBS@ @LASH_LIBS@ +libraul_la_LDFLAGS = -version-info @RAUL_SO_VERSION@ lib_LTLIBRARIES = libraul.la |