debug output

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 77af788658fc6c59e260879f5200e587068f99a3..81b5f058816c626475ee57616938789664ecb693 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -18,6 +18,9 @@ import commands
 from sets import Set
 import SCons.Node.FS
 
+print "\n----------------------------------------\nPlease build Ardour 3.X using waf:\n\n./waf configure\n./waf"
+exit (0)
+
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
@@ -290,7 +293,7 @@ def create_stored_revision (target = None, source = None, env = None):
             sys.exit (-1)
 
     try:
-       text  = "#include <ardour/svn_revision.h>\n"
+       text  = "#include \"ardour/svn_revision.h\"\n"
        text += "namespace ARDOUR {\n";
        text += "extern const char* svn_revision = \"" + rev + "\";\n";
        text += "}\n";
@@ -1062,7 +1065,7 @@ elif conf.CheckCHeader('alsa/asoundlib.h'):
     libraries['sysmidi'] = LibraryInfo ()
     libraries['sysmidi'].ParseConfig('pkg-config --cflags --libs alsa')
     env['SYSMIDI'] = 'ALSA Sequencer'
-    subst_dict['%MIDITAG%'] = "seq"
+    subst_dict['%MIDITAG%'] = "control"
     subst_dict['%MIDITYPE%'] = "alsa/sequencer"
     print "Using ALSA MIDI"
 elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
@@ -1485,12 +1488,12 @@ create_stored_revision()
 # the subdirs
 #
 
-for subdir in coredirs:
-    SConscript (subdir + '/SConscript')
+#for subdir in coredirs:
+#    SConscript (subdir + '/SConscript')
 
-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]:
-    for subdir in sublistdir:
-        SConscript (subdir + '/SConscript')
+#for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]:
+#    for subdir in sublistdir:
+#        SConscript (subdir + '/SConscript')
 
 # cleanup
 env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log'])