Fix export, which has been broken since the boost::signals2 changes. Also update...

[ardour.git] / libs / audiographer / wscript

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index bb60a4c5e153d5db5508f8bab168c2a24812c1d8..b9391df2745c1e96a5de172ab926f99db1c6edea 100644 (file)
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -46,27 +46,24 @@ def build(bld):
 
        # Headers
        #bld.install_files('${INCLUDEDIR}/audiographer', 'audiographer/*.h')
+       #bld.install_files('${INCLUDEDIR}/audiographer/general', 'audiographer/general/*.h')
+       #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', 'audiographer/sndfile/*.h')
+       #bld.install_files('${INCLUDEDIR}/audiographer/utils', 'audiographer/utils/*.h')
        
+       #bld.env['BUILD_TESTS'] = True
        bld.env['HAVE_ALL_GTHREAD'] = bld.env['HAVE_GLIB'] and bld.env['HAVE_GLIBMM'] and bld.env['HAVE_GTHREAD']
 
        audiographer = bld.new_task_gen('cxx', 'shlib')
        audiographer.source = '''
-               src/gdither/gdither.cc
-               src/sample_format_converter.cc
+               private/gdither/gdither.cc
+               src/general/sample_format_converter.cc
                src/routines.cc
-               src/utils.cc
+               src/debug_utils.cc
        '''
        
-       if bld.env['HAVE_SNDFILE']:
-               audiographer.source += '''
-                       src/sndfile_base.cc
-                       src/sndfile_writer.cc
-                       src/sndfile_reader.cc
-               '''
-       
        if bld.env['HAVE_SAMPLERATE']:
                audiographer.source += '''
-                       src/sr_converter.cc
+                       src/general/sr_converter.cc
                '''
        
        audiographer.name           = 'libaudiographer'
@@ -76,36 +73,38 @@ def build(bld):
        audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
        audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
        audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+       
 
        if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
                # Unit tests
                obj              = bld.new_task_gen('cxx', 'program')
                obj.source       = '''
-                       tests/identity_vertex_test.cc
-                       tests/interleaver_test.cc
-                       tests/deinterleaver_test.cc
-                       tests/interleaver_deinterleaver_test.cc
-                       tests/chunker_test.cc
-                       tests/sample_format_converter_test.cc
                        tests/test_runner.cc
-                       tests/peak_reader_test.cc
-                       tests/normalizer_test.cc
-                       tests/silence_trimmer_test.cc
+                       tests/type_utils_test.cc
+                       tests/utils/identity_vertex_test.cc
+                       tests/general/interleaver_test.cc
+                       tests/general/deinterleaver_test.cc
+                       tests/general/interleaver_deinterleaver_test.cc
+                       tests/general/chunker_test.cc
+                       tests/general/sample_format_converter_test.cc
+                       tests/general/peak_reader_test.cc
+                       tests/general/normalizer_test.cc
+                       tests/general/silence_trimmer_test.cc
                '''
                
                if bld.env['HAVE_ALL_GTHREAD']:
                        obj.source += '''
-                               tests/threader_test.cc
+                               tests/general/threader_test.cc
                        '''
                
                if bld.env['HAVE_SNDFILE']:
                        obj.source += '''
-                               tests/sndfile_writer_test.cc
+                               tests/sndfile/tmp_file_test.cc
                        '''
 
                if bld.env['HAVE_SAMPLERATE']:
                        obj.source += '''
-                               tests/sr_converter_test.cc
+                               tests/general/sr_converter_test.cc
                        '''
                
                obj.uselib_local = 'libaudiographer'