Changeset: c388f0e2c8b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c388f0e2c8b0
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
monetdb5/extras/rapi/Makefile.ag
Branch: Oct2014
Log Message:
Added XDEPS keyword in lib blurb in Makefile.ag for extra dependencies.
diffs (41 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -817,6 +817,12 @@ def am_library(fd, var, libmap, am):
deps.append(target)
fd.write(nsrcs + "\n")
fd.write(srcs + "\n")
+ if 'XDEPS' in libmap:
+ fd.write(fullpref + '_DEPENDENCIES =')
+ for dep in libmap['XDEPS']:
+ fd.write(' ')
+ fd.write(dep)
+ fd.write('\n')
if deps:
fd.write(am_additional_deps(libname, sep, "LIB", deps, am, pref))
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
@@ -816,6 +816,8 @@ def msc_library(fd, var, libmap, msc):
srcs = '%s%s%s_OBJS =' % (pref, sep, libname)
deps = '%s%s%s_DEPS = $(%s%s%s_OBJS)' % (pref, sep, libname, pref, sep,
libname)
+ for dep in libmap.get('XDEPS', []):
+ deps = deps + ' ' + dep
deffile = ''
for target in libmap['TARGETS']:
if target == "@LIBOBJS@":
diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag
--- a/monetdb5/extras/rapi/Makefile.ag
+++ b/monetdb5/extras/rapi/Makefile.ag
@@ -28,7 +28,8 @@ MTSAFE
lib__rapi = {
MODULE
DIR = libdir/monetdb5
- SOURCES = rapi.c rapi.h $(libr_LIBDEP)
+ SOURCES = rapi.c rapi.h
+ XDEPS = $(libr_LIBDEP)
LIBS = ../../tools/libmonetdb5 \
../../../gdk/libbat \
$(MALLOC_LIBS) $(libr_LIBS)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
