Changeset 3050cb8


Ignore:
Timestamp:
Mar 31, 2005, 11:18:14 PM (19 years ago)
Author:
Paul Brossier <piem@altern.org>
Branches:
feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+
Children:
e50b695
Parents:
1f40359
Message:

added configure rules to check presence of swig, python,

puredata and docbook-to-man.
deleted autotools generated files
activated threading in midi_alsa_seq.c

Files:
24 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • ChangeLog

    r1f40359 r3050cb8  
     12005-29-03  Paul Brossier <piem@altern.org>
     2        * python/aubio/gnuplot.py: clean up and add plotsound
     3        * python/aubiocompare-onset: updated
     4        * examples/aubioonset.c: fix text output when nframes<4
     5        * ext/midi/midi_file.c: by default, int is unsigned on powerpc
     6        * python/aubiocut, python/aubio/aubioclass.py: updated
     7        * ext/midi/midi_alsa_seq.c: activated threading
     8        * configure.ac,Makefile.am: added rules to check presence
     9         of swig, python, puredata and docbook-to-man.
     10
     112005-17-03  Paul Brossier <piem@altern.org>
     12        * examples/utils.{c,h}:  corrected usedoubled and -O interactions
     13        * examples/aubioonset.c: added frames>=4 check (thanks Hamish Allan)
     14
    1152004-12-11  Paul Brossier <piem@altern,org>
    2         * swig/Makefile.am: instructions moved to python/aubio and cleaned
     16        * swig/Makefile.am: instructions moved to python/aubio and cleaned 
    317        * python/aubiocut: corrected slicing on multichannel files
    418        * VERSION: bumped to 0.1.8

  • Makefile.am

    r1f40359 r3050cb8  
    1 SUBDIRS = src ext examples doc sounds swig python plugins
     1if DOCBOOKFOUND
     2DOC = doc
     3endif
     4
     5if SWIGFOUND
     6if PYTHONFOUND
     7SWIGDIR = swig
     8PYTHONDIR = python
     9endif
     10endif
     11
     12SUBDIRS = src ext examples doc sounds plugins $(PYTHONDIR) $(SWIGDIR) $(DOC)
    213EXTRA_DIST = bootstrap VERSION
    314DISTCLEANFILES = autom4te.cache

  • configure.ac

    r1f40359 r3050cb8  
    1515CFLAGS="$CFLAGS -O2"
    1616
    17        
    1817dnl Check for debug
    1918AC_ARG_ENABLE(debug,
    … …  
    3433if test "$with_warnme" = "yes"
    3534then
    36         ALL_CWARNINGS="-Wall -Werror -Wmissing-prototypes -Wmissing-declarations -Wno-char-subscripts -Wno-unknown-pragmas"
    37         CFLAGS="$CFLAGS $ALL_CWARNINGS"
     35  ALL_CWARNINGS="-Wall -Werror -Wmissing-prototypes -Wmissing-declarations -Wno-char-subscripts -Wno-unknown-pragmas"
     36  CFLAGS="$CFLAGS $ALL_CWARNINGS"
    3837fi
    3938
    … …  
    4847fi
    4948AC_PROG_INSTALL
    50 dnl AC_PROG_SWIG
    5149
    5250dnl Check for libtool
    … …  
    7371esac
    7472
    75 dnl Check for libraries
     73dnl Check for required libraries
    7674AC_CHECK_LIB(pthread, pthread_create)
    7775
    … …  
    146144fi
    147145 
    148 AM_PATH_PYTHON(,,)
     146dnl Check for optional programs
     147
     148dnl should check for swig version and python headers
     149AC_PATH_PROG(SWIG,swig,no)
     150AM_CONDITIONAL(SWIGFOUND, test "${SWIG}" != "no")
     151AM_PATH_PYTHON
     152AM_CONDITIONAL(PYTHONFOUND, test "${PYTHON}" != "no")
     153
     154AC_PATH_PROG(DOCBOOK_TO_MAN,docbook-to-man,no)
     155AM_CONDITIONAL(DOCBOOKFOUND, test "${DOCBOOK_TO_MAN}" != "no")
     156
     157AC_CHECK_HEADER(m_pd.h,PUREDATA=y,AC_MSG_WARN([Ouch! puredata header not found]))
     158AM_CONDITIONAL(PUREDATAFOUND, test "${PUREDATA}" = "y")
    149159
    150160AC_OUTPUT([
    … …  
    154164                examples/Makefile
    155165                sounds/Makefile
    156                 doc/Makefile
     166                swig/Makefile
    157167                python/Makefile
    158168                python/aubio/Makefile
    … …  
    161171                plugins/audacity/plug-ins/Makefile
    162172                plugins/wavesurfer/Makefile
    163                 plugins/puredata/Makefile
    164                 swig/Makefile
     173                plugins/puredata/Makefile
     174                doc/Makefile
    165175        ])
    166176

  • doc/Makefile.am

    r1f40359 r3050cb8  
    1 #  install the man pages and include in distribution
    2 #man_MANS = fluidsynth.1
    3 #EXTRA_DIST = $(man_MANS) devel.cfg fluidsynth.1
    41EXTRA_DIST = devel.cfg examples.cfg user.cfg aubio.css \
    5         aubionotes.sgml aubioonset.sgml
     2        aubionotes.sgml aubioonset.sgml \
     3        aubioonset.1 aubionotes.1
    64
    75man_MANS = aubionotes.1 aubioonset.1
    86CLEANFILES = $(man_MANS)
    9 #docbook_docs = aubio-devdoc.xml
    10 #DOCBOOK_STYLESHEET ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
    117
    128all:
    139
    14 # Run "make update-docs" to update developer doc and doxygen reference
    15 #update-docs: xmldocbook doxygen
    1610update-docs: doc-devel
    17 
    18 # The new XML DocBook way:
    19 #xmldocbook: $(docbook_docs)
    20 #       -rm -rf html
    21 #       $(mkinstalldirs) html
    22 #       xsltproc -o html/ --catalogs $(DOCBOOK_STYLESHEET) $<
    2311
    2412doc-clean:
    … …  
    4129        docbook-to-man $< > $*.1
    4230
    43 # Update docs for distribution
    44 #dist-hook:
    45 
    4631clean:
    47         rm -rf devel user examples *.1
     32        rm -rf devel user examples #*.1
    4833
    4934distclean-hook: clean

  • ext/midi/midi_alsa_seq.c

    r1f40359 r3050cb8  
    380380{
    381381    aubio_alsa_seq_driver_t* dev = (aubio_alsa_seq_driver_t*) d;
    382     /*
    383     if (pthread_join(dev->thread, NULL)) {
     382    if (dev->thread){ if(pthread_join(dev->thread, NULL)) {
    384383        AUBIO_ERR( "Failed to join the midi thread");
    385     }
    386     */
     384    }}
    387385    switch(event->type)
    388386    {
    … …  
    410408        snd_seq_event_output_direct(dev->seq_handle, &ev);
    411409    }
    412     /*
    413     if (pthread_detach(dev->thread)) {
     410    if (dev->thread) { if(pthread_detach(dev->thread)) {
    414411        AUBIO_ERR( "Failed to leave the midi thread");
    415     }
    416     */
     412    }}
    417413}
    418414

  • plugins/Makefile.am

    r1f40359 r3050cb8  
    1 SUBDIRS = wavesurfer audacity puredata
     1if PUREDATAFOUND
     2PUREDATA = puredata
     3endif
     4SUBDIRS = wavesurfer audacity ${PUREDATA}

  • python/aubio/Makefile.am

    r1f40359 r3050cb8  
    88all: _aubiowrapper.so
    99
    10 SWIG = swig
    1110# removed -Wall -Wmissing-prototypes -Wmissing-declarations
    12 SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
     11SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas \
     12        -I../../src -I../../ext \
     13        -I/usr/include/python${PYTHON_VERSION} \
     14        -I${prefix}/include/python${PYTHON_VERSION} \
     15        -I/usr/include \
     16        -I${prefix}/include
     17
    1318SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
    1419
Note: See TracChangeset for help on using the changeset viewer.