fix for mis-merge of region dialog gain patch (#2879), from colinf

[ardour.git] / libs / fst / SConscript

diff --git a/libs/fst/SConscript b/libs/fst/SConscript
index fd1d0f796a853fcd4b1249e78754aa16c81a2974..a543d72a501ae4f7cbb0b7e9299fdaa0f58368f0 100644 (file)
--- a/libs/fst/SConscript
+++ b/libs/fst/SConscript
@@ -15,8 +15,6 @@ fst.Merge ([
         libraries['glib2']
         ])
 
-fst.Replace(CC = list ("winegcc"))
-
 #
 # See if JACK supports jack_set_thread_creator()
 #
@@ -52,17 +50,21 @@ if conf.CheckJackSetThreadCreator():
 fst = conf.Finish ()
 
 if fst['VST']:
+    fst.Replace(CC = ("winegcc"))
     a = fst.Object ('fst', 'fst.c')
     b = fst.Object ('fstinfofile', 'fstinfofile.c')
     c = fst.Object ('vstwin', 'vstwin.c')
     d = fst.Object ('vsti', 'vsti.c')
     e = fst.Object ('thread', 'thread.c')
-
     Default([a,b,c,d,e])
     
+vestige_headers = glob.glob ('vestige/*.h')
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                     fst_src + ['SConscript',
-                                                'fst.h',
-                                                'jackvst.h'
-                                                ] ))
+                                     fst_src + vestige_headers +
+                                     ['SConscript',
+                                      'fst.h',
+                                      'jackvst.h',
+                                      ] 
+                                     ))