Changeset: 9737b3529586 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9737b3529586
Modified Files:
buildtools/autogen/autogen/msc.py
Branch: default
Log Message:
Make sure .mx files are extracted before entering a subdir.
This fixes the problem that sql/backends/monet5/UDF was being built
before sql.h existed in sql/backends/monet5.
diffs (40 lines):
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -325,6 +325,8 @@
if dep != t:
fd.write('%s"%s"' % (sep, dep))
sep = " "
+ if dep.endswith('.mx') and tar not in msc['BUILT_SOURCES']:
+ msc['BUILT_SOURCES'].append(tar)
else:
print "!WARNING: dropped absolute dependency " + d
if sep == " ":
@@ -493,6 +495,8 @@
condname = ''
msc['INSTALL'][header] = header, '', sd, '', condname
msc['SCRIPTS'].append(header)
+ if header not in headers['SOURCES']:
+ msc['BUILT_SOURCES'].append(cheader)
## msc_find_ins(msc, headers)
## msc_deps(fd, headers['DEPS'], "\.o", msc)
@@ -1159,7 +1163,7 @@
fd.write("srcdir = $(TOPDIR)\\..%s\n" % string.replace(srcdir, '/', '\\'))
fd.write("!INCLUDE $(TOPDIR)\\..\\NT\\rules.msc\n")
if tree.has_key("SUBDIRS"):
- fd.write("all: all-recursive all-msc\n")
+ fd.write("all: build-all\n")
fd.write("check: check-recursive check-msc\n")
fd.write("install: install-recursive install-msc\n")
else:
@@ -1199,6 +1203,9 @@
fd.write(" %s" % v)
fd.write("\n")
+ if tree.has_key('SUBDIRS'):
+ fd.write('build-all: $(BUILT_SOURCES) all-recursive all-msc\n')
+
## fd.write("EXTRA_DIST = Makefile.ag Makefile.msc")
## for v in msc['EXTRA_DIST']:
## fd.write(" %s" % v)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
