From 87afb54c43580a590d8fed3ebfa1eee76ded8986 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 25 Apr 2008 12:58:55 +1000 Subject: [PATCH] Remove duplication in lists containing build directories --- SConstruct | 83 +++++++++++++++++++++-------------------------------------- 1 files changed, 30 insertions(+), 53 deletions(-) diff --git a/SConstruct b/SConstruct index 9287e8f..a5eb82d 100644 --- a/SConstruct +++ b/SConstruct @@ -978,6 +978,34 @@ else: env = conf.Finish() +coredirs = [ + 'templates' + ] + +subdirs = [ + 'libs/libsndfile', + 'libs/pbd', + 'libs/midi++2', + 'libs/ardour', +# these are unconditionally included but have +# tests internally to avoid compilation etc +# if VST is not set + 'libs/fst', + 'vst', +# this is unconditionally included but has +# tests internally to avoid compilation etc +# if COREAUDIO is not set + 'libs/appleutility', + 'libs/vamp-sdk', + 'libs/vamp-plugins' + ] + +gtk_subdirs = [ + 'libs/gtkmm2ext', + 'gtk2_ardour', + 'libs/clearlooks' + ] + if env['SYSLIBS']: syslibdeps = \ @@ -1035,35 +1063,6 @@ if env['SYSLIBS']: libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') - - coredirs = [ - 'templates' - ] - - subdirs = [ - 'libs/libsndfile', - 'libs/pbd', - 'libs/midi++2', - 'libs/ardour', - 'libs/vamp-sdk', - 'libs/vamp-plugins/', - # these are unconditionally included but have - # tests internally to avoid compilation etc - # if VST is not set - 'libs/fst', - 'vst', - # this is unconditionally included but has - # tests internally to avoid compilation etc - # if COREAUDIO is not set - 'libs/appleutility' - ] - - gtk_subdirs = [ -# 'libs/flowcanvas', - 'libs/gtkmm2ext', - 'gtk2_ardour', - 'libs/clearlooks' - ] else: libraries['sigc2'] = LibraryInfo(LIBS='sigc++2', @@ -1101,39 +1100,17 @@ else: LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') - coredirs = [ - 'templates' - ] - - subdirs = [ + subdirs += [ 'libs/sigc++2', - 'libs/libsndfile', - 'libs/pbd', - 'libs/midi++2', - 'libs/ardour', - 'libs/vamp-sdk', - 'libs/vamp-plugins/', - # these are unconditionally included but have - # tests internally to avoid compilation etc - # if VST is not set - 'libs/fst', - 'vst', - # this is unconditionally included but has - # tests internally to avoid compilation etc - # if COREAUDIO is not set - 'libs/appleutility' ] - gtk_subdirs = [ + gtk_subdirs += [ 'libs/glibmm2', 'libs/gtkmm2/pango', 'libs/gtkmm2/atk', 'libs/gtkmm2/gdk', 'libs/gtkmm2/gtk', 'libs/libgnomecanvasmm', - 'libs/gtkmm2ext', - 'gtk2_ardour', - 'libs/clearlooks' ] # -- 1.5.4.1