From: Paul Brossier Date: Wed, 30 Sep 2009 01:54:34 +0000 (+0200) Subject: moved cpp to interfaces/ X-Git-Tag: bzr2git~246 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7de4de015830d47694c5375bd96147f0b530af9b;p=aubio.git moved cpp to interfaces/ --- diff --git a/configure.ac b/configure.ac index 77cda705..c4052b60 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,6 @@ AC_OUTPUT([ Makefile src/Makefile ext/Makefile - cpp/Makefile examples/Makefile tests/Makefile tests/src/Makefile @@ -252,6 +251,7 @@ AC_OUTPUT([ python/aubio/Makefile interfaces/java/Makefile interfaces/java/aubio/Makefile + interfaces/cpp/Makefile plugins/Makefile plugins/audacity/Makefile plugins/audacity/plug-ins/Makefile diff --git a/cpp/Makefile.am b/interfaces/cpp/Makefile.am similarity index 100% rename from cpp/Makefile.am rename to interfaces/cpp/Makefile.am diff --git a/cpp/aubiocpp.cpp b/interfaces/cpp/aubiocpp.cpp similarity index 100% rename from cpp/aubiocpp.cpp rename to interfaces/cpp/aubiocpp.cpp diff --git a/cpp/aubiocpp.h b/interfaces/cpp/aubiocpp.h similarity index 100% rename from cpp/aubiocpp.h rename to interfaces/cpp/aubiocpp.h diff --git a/cpp/wscript_build b/interfaces/cpp/wscript_build similarity index 89% rename from cpp/wscript_build rename to interfaces/cpp/wscript_build index 6d7a4661..48fcc6ff 100644 --- a/cpp/wscript_build +++ b/interfaces/cpp/wscript_build @@ -1,7 +1,7 @@ # build libaubiocpp libaubiocpp = bld.new_task_gen( features = 'cxx cshlib', - includes = ['.', '../src'], + includes = ['.', '../../src'], source = bld.path.ant_glob('*.cpp'), target = 'aubiocpp', uselib_local = ['aubio'], diff --git a/wscript b/wscript index 9c680be9..d8fe5a40 100644 --- a/wscript +++ b/wscript @@ -135,7 +135,7 @@ def build(bld): bld.env['LIB_VERSION'] = LIB_VERSION # add sub directories - bld.add_subdirs('src ext examples cpp') + bld.add_subdirs('src ext examples interfaces/cpp') if bld.env['SWIG']: if bld.env['PYTHON']: bld.add_subdirs('python/aubio python')