change libsndfile to libsndfile-ardour to eliminate possible confusion with a system lib

git-svn-id: svn://localhost/ardour2/trunk@1041 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 013eb7d5e5e84a32036c0422d6fa2b792bfb9ccb..3959ef68baf85a36b885aa0b945b76553f587a68 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -552,7 +552,7 @@ if env['SYSLIBS']:
 # cannot use system one for the time being
 #
     
-    libraries['sndfile'] = LibraryInfo(LIBS='libsndfile',
+    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
                                     LIBPATH='#libs/libsndfile',
                                     CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
 
@@ -619,7 +619,7 @@ else:
     libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
                                           LIBPATH='#libs/soundtouch',
                                           CPPPATH=['#libs', '#libs/soundtouch'])
-    libraries['sndfile'] = LibraryInfo(LIBS='libsndfile',
+    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
                                     LIBPATH='#libs/libsndfile',
                                     CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
 #    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 291ad59a0806e22fec0f962f7dfcbed989da6449..25109d660d81f1aa7803e15c4f223443ce5764df 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -227,7 +227,7 @@ ardour = conf.Finish ()
 ardour.Merge ([
             libraries['core'],
             libraries['xml'],
-            libraries['sndfile'],
+            libraries['sndfile-ardour'],
             libraries['raptor'],
             libraries['lrdf'],
             libraries['samplerate'],

diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript
index b1c29e54876d5fa10390bd7299ad672844bd7f2c..f8e9fc5ecbbe379b9a93889c66ac19922186f1c5 100644 (file)
--- a/libs/libsndfile/SConscript
+++ b/libs/libsndfile/SConscript
@@ -25,7 +25,7 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreServices.framework/Headers/
 
 sndfile = conf.Finish()
 
-libsndfile = sndfile.SharedLibrary('sndfile', sndfile_files)
+libsndfile = sndfile.SharedLibrary('sndfile-ardour', sndfile_files)
 
 sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ)
 

diff --git a/vst/SConscript b/vst/SConscript
index 988a386de337315d02cb9ed8197ab10a762fd658..2a4d492f8a6b5ff676cbc768e3760583a29dc4dd 100644 (file)
--- a/vst/SConscript
+++ b/vst/SConscript
@@ -35,7 +35,7 @@ ardour_vst.Merge ([
     libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
     libraries['sysmidi'],
-    libraries['sndfile'],
+    libraries['sndfile-ardour'],
     libraries['flac'],
     libraries['lrdf'],
     libraries['glibmm2'],