diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | debian/Makefile.am | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 28 | ||||
| -rw-r--r-- | doc/reference.doxygen.in | 2 | ||||
| -rw-r--r-- | slv2/plugininstance.h | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
8 files changed, 45 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index 24a7967..1072361 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,19 +13,14 @@ dist-check-doxygen: @false endif -#SUBDIRS = src slv2 utils hosts data $(DOC_DIR) swig debian -#DIST_SUBDIRS = src slv2 utils hosts data doc swig debian -SUBDIRS = src slv2 utils hosts data doc swig debian +SUBDIRS = src slv2 utils hosts data $(DOC_DIR) swig debian +DIST_SUBDIRS = src slv2 utils hosts data doc swig debian pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = slv2.pc dist-hook: dist-check-doxygen -distclean-local: - rm -rf doc/slv2 - rm -rf doc/reference.doxygen - docs: cd doc && make docs diff --git a/configure.ac b/configure.ac index e666aba..811bb3c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT([slv2],0.3.1,[dave@drobilla.net]) +AC_INIT([slv2],0.3.2,[dave@drobilla.net]) AC_CONFIG_AUX_DIR([config]) @@ -26,11 +26,12 @@ AM_INIT_AUTOMAKE # 0.2.0 = 3,0,0 # 0.3.0 = 4,0,0 # 0.3.1 = 4,0,0 +# 0.3.2 = 5,0,1 -SLV2_VERSION="0.3.1" -SLV2_API_CURRENT="4" +SLV2_VERSION="0.3.2" +SLV2_API_CURRENT="5" SLV2_API_REVISION="0" -SLV2_API_AGE="0" +SLV2_API_AGE="1" AC_SUBST(SLV2_API_CURRENT) AC_SUBST(SLV2_API_REVISION) @@ -47,8 +48,10 @@ cd $builddir SLV2_CFLAGS="-I$abs_srcdir" SLV2_LIBS="$abs_srcdir/src/.libs/libslv2.la" +SLV2_SRCDIR="$abs_srcdir" AC_SUBST(SLV2_CFLAGS) AC_SUBST(SLV2_LIBS) +AC_SUBST(SLV2_SRCDIR) CONFIG_H_PATH="$builddir/config/config.h" @@ -98,6 +101,7 @@ if test "X$REDLAND_CONFIG" = X; then AC_MSG_ERROR([REDLANDMM requires Redland (librdf), but redland-config not found.]) else build_redland="yes" + PKG_CHECK_MODULES(RAPTOR, raptor, build_raptor="yes", build_raptor="no") REDLAND_CFLAGS=`$REDLAND_CONFIG --cflags` REDLAND_LIBS=`$REDLAND_CONFIG --libs` AC_SUBST(REDLAND_CFLAGS) @@ -122,12 +126,17 @@ else fi AM_CONDITIONAL(WITH_JACK, [test "$build_jack" = "yes"]) -# Doxygen is required to make dist +# 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, documentation will not be built]) + AC_MSG_WARN([*** Doxygen not found, API documentation will not be built]) + build_documentation="no" fi -AM_CONDITIONAL(HAVE_DOXYGEN, $HAVE_DOXYGEN) +AM_CONDITIONAL(HAVE_DOXYGEN, [test "x$build_documentation" = "xyes"]) # Bolt on a few specific flags to CFLAGS that should always be used CXXFLAGS="$CXXFLAGS -ansi -pipe -fmessage-length=999 -DCONFIG_H_PATH=\\\"$CONFIG_H_PATH\\\"" diff --git a/debian/Makefile.am b/debian/Makefile.am index 31ff478..3590e6b 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -6,6 +6,5 @@ EXTRA_DIST = \ copyright \ dirs \ docs \ - files \ rules \ shlibs.local diff --git a/debian/changelog b/debian/changelog index 7a3fbca..623581e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +slv2 (0.3.2) unstable; urgency=low + + * Build man pages + + -- Dave Robillard <dave@drobilla.net> Wed, 30 Nov 2007 18:19:00 -0500 + slv2 (0.3.1) unstable; urgency=low * Initial Debian Release. diff --git a/doc/Makefile.am b/doc/Makefile.am index 50532ed..33cb830 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,15 +1,21 @@ -EXTRA_DIST = mainpage.dox man.dox html.dox reference.doxygen +dist_man_MANS = \ + man/man3/slv2.3 \ + man/man3/slv2_collections.3 \ + man/man3/slv2_data.3 \ + man/man3/slv2_library.3 \ + man/man3/slv2_util.3 \ + man/man3/slv2_world.3 -man_MANS = \ - @abs_top_builddir@/doc/slv2/man/man3/slv2.3 \ - @abs_top_builddir@/doc/slv2/man/man3/slv2_collections.3 \ - @abs_top_builddir@/doc/slv2/man/man3/slv2_data.3 \ - @abs_top_builddir@/doc/slv2/man/man3/slv2_library.3 \ - @abs_top_builddir@/doc/slv2/man/man3/slv2_util.3 \ - @abs_top_builddir@/doc/slv2/man/man3/slv2_world.3 +EXTRA_DIST = mainpage.dox reference.doxygen.in $(man_MANS) -all-local: docs +%.3: + make docs -docs: $(srcdir)/reference.doxygen.in reference.doxygen $(srcdir)/../slv2/*.h - mkdir -p @abs_top_builddir@/doc/slv2 +reference.doxygen: @SLV2_SRCDIR@/doc/reference.doxygen.in + +distclean-local: + rm -rf man html + +docs: reference.doxygen @SLV2_SRCDIR@/slv2/*.h doxygen reference.doxygen + diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in index b7fbe90..8ab5f57 100644 --- a/doc/reference.doxygen.in +++ b/doc/reference.doxygen.in @@ -38,7 +38,7 @@ PROJECT_NUMBER = @PACKAGE_VERSION@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = @top_builddir@/doc/slv2 +OUTPUT_DIRECTORY = # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output diff --git a/slv2/plugininstance.h b/slv2/plugininstance.h index c960e86..d72c8ad 100644 --- a/slv2/plugininstance.h +++ b/slv2/plugininstance.h @@ -38,7 +38,7 @@ typedef struct _InstanceImpl* SLV2InstanceImpl; * documented and should not be used directly. The remaining implementation * details are in the opaque pimpl member. */ -typedef struct { +typedef struct _Instance { const LV2_Descriptor* lv2_descriptor; LV2_Handle lv2_handle; SLV2InstanceImpl pimpl; ///< Private implementation diff --git a/src/Makefile.am b/src/Makefile.am index 12fd132..92e9515 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ -AM_CFLAGS = -std=c99 @SLV2_CFLAGS@ @REDLAND_CFLAGS@ -DLIBSLV2_SOURCE +AM_CFLAGS = -std=c99 @SLV2_CFLAGS@ @REDLAND_CFLAGS@ @RAPTOR_CFLAGS@ -DLIBSLV2_SOURCE lib_LTLIBRARIES = libslv2.la -libslv2_la_LIBADD = @REDLAND_LIBS@ -ldl +libslv2_la_LIBADD = @REDLAND_LIBS@ @RAPTOR_LIBS@ -ldl libslv2_la_LDFLAGS = -version-info @SLV2_SO_VERSION@ libslv2_la_SOURCES = \ |