diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-09 17:56:13 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-09 17:56:13 +0000 |
commit | 048526fde8a69e90dfe50b3116adfcd02678bace (patch) | |
tree | 23b29b6cf0cb9a2b0dd006d0fe855285602c81ae /SConstruct | |
parent | 0d0f71ee92fb7ce53fbcb8c7b0cd93b1cdf3529f (diff) |
do not conditionally add directories to "subdirs" because then they are not included in the src tarball if various scons flags are not set
git-svn-id: svn://localhost/ardour2/trunk@960 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/SConstruct b/SConstruct index 20e36defa1..21f33db46a 100644 --- a/SConstruct +++ b/SConstruct @@ -15,7 +15,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -version = '2.0beta4' +version = '2.0beta5' subst_dict = { } @@ -25,7 +25,7 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( - ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), + ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), @@ -565,15 +565,18 @@ if env['SYSLIBS']: 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', - 'libs/ardour' + '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' ] - if env['VST']: - subdirs = ['libs/fst'] + subdirs + ['vst'] - - if env['COREAUDIO']: - subdirs = subdirs + ['libs/appleutility'] - gtk_subdirs = [ # 'libs/flowcanvas', 'libs/gtkmm2ext', @@ -626,15 +629,18 @@ else: 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', - 'libs/ardour' + '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' ] - if env['VST']: - subdirs = ['libs/fst'] + subdirs + ['vst'] - - if env['COREAUDIO']: - subdirs = subdirs + ['libs/appleutility'] - gtk_subdirs = [ 'libs/glibmm2', 'libs/gtkmm2/pango', @@ -970,6 +976,7 @@ env.Distribute (env['DISTTREE'], srcdist = env.Tarball(env['TARBALL'], env['DISTTREE']) env.Alias ('srctar', srcdist) + # # don't leave the distree around # @@ -985,6 +992,7 @@ for subdir in coredirs: for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: for subdir in sublistdir: + print "doing stuff in " + subdir + "\n" SConscript (subdir + '/SConscript') # cleanup |