X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=SConstruct;h=9e7c40b1034e86f96d75b518ae791e7633fe1164;hb=ea3a2ffc5e44a39f6a348315c79d0751cf4ca64f;hp=0095768056822dc1b4ef17875ec0eaa2f24cf668;hpb=16373a56c99ca3569656cb06f3e7c8bc49f0a45f;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index 0095768056..9e7c40b103 100644
--- a/SConstruct
+++ b/SConstruct
@@ -248,6 +248,8 @@ prefix = env['prefix']
 bindir = os.path.join (prefix, 'bin')
 sharedir = os.path.join (prefix, 'share')
 libdir = os.path.join (prefix, 'lib')
+libdir_package = os.path.join (libdir, package.name)
+lidbir_package_version = os.path.join (libdir_package, version)
 localedir = os.path.join (sharedir, 'locale')
 sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
 sharedir_package = os.path.join (sharedir, package.name)
@@ -339,7 +341,7 @@ def configure (target, source, env):
 	test_program (required, 'guile-config', '1.6', 'GUILE development',
 			'libguile-dev or guile-devel')
 	test_program (required, 'mf', '0.0', 'Metafont', 'tetex-bin')
-	test_program (required, 'mftrace', '1.1.6',
+	test_program (required, 'mftrace', '1.1.9',
 		      'mftrace (http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
 	test_program (required, 'potrace', '0.0', 'Potrace', 'potrace')
 	test_program (required, 'python', '2.1', 'Python (www.python.org)',
@@ -369,7 +371,7 @@ def configure (target, source, env):
 
 	def CheckYYCurrentBuffer (context):
 		context.Message ('Checking for yy_current_buffer... ')
-		ret = conf.TryLink ("""using namespace std;
+		ret = conf.TryCompile ("""using namespace std;
 		#include <FlexLexer.h>
 		class yy_flex_lexer: public yyFlexLexer
 		{
@@ -676,8 +678,9 @@ env.Append (
 	PSPDF_FLAGS = ['-sPAPERSIZE=$DVIPS_PAPERSIZE'],
 	)
 
+env.Append (CCFLAGS = ['-pipe', '-Wno-pmf-conversions'])
 if env['debugging']:
-	env.Append (CCFLAGS = ['-g', '-pipe'])
+	env.Append (CCFLAGS = ['-g'])
 if env['optimising']:
 	env.Append (CCFLAGS = '-O2')
 	env.Append (CXXFLAGS = ['-DSTRING_UTILS_INLINED'])
@@ -687,6 +690,8 @@ if env['warnings']:
 
 # ugr,huh?
 env.Append (LINKFLAGS = ['-Wl,--export-dynamic'])
+# FIXME: ParseConfig ignores -L flag?
+env.Append (LINKFLAGS = ['-L/usr/X11R6/lib'])
 
 if env['verbose']:
 	env['__verbose'] = ' --verbose'
@@ -755,10 +760,10 @@ env.Append (
 
 	# FIXME: move to lily/SConscript?
 	LIBPATH = [os.path.join (absbuild, 'flower', env['out']),
-		   os.path.join (absbuild, 'kpath-guile', env['out']),
-		   os.path.join (absbuild, 'ttftool', env['out']),],
+		   os.path.join (absbuild, 'kpath-guile', env['out']),],
 	CPPPATH = [outdir, ],
-	LILYPOND_PATH = ['.', '$srcdir/input',
+	LILYPOND_PATH = ['.',
+			 '$srcdir/input',
 			 '$srcdir/input/regression',
 			 '$srcdir/input/test',
 			 '$srcdir/input/tutorial',
@@ -855,7 +860,7 @@ def symlink_tree (target, source, env):
 			   % vars ())
 	os.chdir (srcdir)
 
-if env['debugging']:
+if 1: #env['debugging']:
 	stamp = os.path.join (run_prefix, 'stamp')
 	env.Command (stamp, ['#/SConstruct', '#/VERSION'],
 		     [symlink_tree, 'touch $TARGET'])
@@ -872,18 +877,20 @@ def cvs_entry_is_file (line):
 	return line[0] == '/' and line[-2] == '/'
 
 def cvs_dirs (dir):
-	ENTRIES = os.path.join (dir, 'CVS/Entries')
-	if not os.path.exists (ENTRIES):
+	entries = os.path.join (dir, 'CVS/Entries')
+	if not os.path.exists (entries):
 		return []
-	entries = open (ENTRIES).readlines ()
+	entries = open (entries).readlines ()
 	dir_entries = filter (cvs_entry_is_dir, entries)
 	dirs = map (lambda x: os.path.join (dir, x[2:x[2:].index ('/')+3]),
 		    dir_entries)
 	return dirs + map (cvs_dirs, dirs)
 
 def cvs_files (dir):
-	ENTRIES = os.path.join (dir, 'CVS/Entries')
-	entries = open (ENTRIES).readlines ()
+	entries = os.path.join (dir, 'CVS/Entries')
+	if not os.path.exists (entries):
+		return []
+	entries = open (entries).readlines ()
 	file_entries = filter (cvs_entry_is_file, entries)
 	files = map (lambda x: x[1:x[1:].index ('/')+1], file_entries)
 	return map (lambda x: os.path.join (dir, x), files)
@@ -911,11 +918,11 @@ if env['fast']\
    and 'web' not in COMMAND_LINE_TARGETS\
    and 'install' not in COMMAND_LINE_TARGETS\
    and 'clean' not in COMMAND_LINE_TARGETS:
-	subdirs = ['lily', 'lily/include',
-		   'flower', 'flower/include',
+	subdirs = ['lily',
+		   'flower',
 		   'kpath-guile',
-		   'ttftool',
 		   'mf',
+		   'python',
 		   ]
 
 if os.path.isdir ('%(srcdir)s/CVS' % vars ()):