moved cpp to interfaces/

diff --git a/configure.ac b/configure.ac
index 77cda7055509a1654af424bafd408e0d47e2feb8..c4052b60cd143987e95b8b13b0ce92ceadbba2c6 100644 (file)
--- 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 6d7a4661c7ec7c32ffc98a31cd2d8cc0b4f328bf..48fcc6ffe4c00952f22fe02cb1eca7bfc7d8489d 100644 (file)
--- 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 9c680be94ddb5387a322fbe6af6f13dd2abd252d..d8fe5a403ace6caabfe16749be8df1277c315d3c 100644 (file)
--- 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')