From 2730b446937b0037ae76937738e9159323b27be5 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 25 Apr 2008 18:30:12 +1000 Subject: [PATCH] Remove duplicate definitions in SConstruct --- SConstruct | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/SConstruct b/SConstruct index 8901a1d..42d1c32 100644 --- a/SConstruct +++ b/SConstruct @@ -1006,6 +1006,15 @@ gtk_subdirs = [ 'libs/clearlooks' ] +# cannot use system one for the time being +libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', + LIBPATH='#libs/libsndfile', + CPPPATH=['#libs/libsndfile/src']) + +libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', + LIBPATH='#libs/appleutility', + CPPPATH='#libs/appleutility') + if env['SYSLIBS']: syslibdeps = \ @@ -1043,23 +1052,11 @@ if env['SYSLIBS']: libraries['libgnomecanvasmm'] = LibraryInfo() libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') -# -# cannot use system one for the time being -# - - libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', - LIBPATH='#libs/libsndfile', - CPPPATH=['#libs/libsndfile/src']) - libraries['soundtouch'] = LibraryInfo() #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') # Comment the previous line and uncomment this for Debian: libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') - libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', - LIBPATH='#libs/appleutility', - CPPPATH='#libs/appleutility') - else: libraries['sigc2'] = LibraryInfo(LIBS='sigc++2', LIBPATH='#libs/sigc++2', @@ -1086,12 +1083,6 @@ else: libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) - libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', - LIBPATH='#libs/libsndfile', - CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) - libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', - LIBPATH='#libs/appleutility', - CPPPATH='#libs/appleutility') subdirs += [ 'libs/sigc++2', -- 1.5.4.1