Changeset: 007b778c5242 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=007b778c5242
Modified Files:
monetdb5/modules/mal/Makefile.ag
sql/backends/monet5/vaults/Makefile.ag
sql/scripts/Makefile.ag
Branch: SciQL-2
Log Message:
removed some configuratiosn related to data vaults because they caused errors
+ fixed a typo
diffs (98 lines):
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -107,5 +107,5 @@ EXTRA_DIST = batExtensions.mal iterator.
00_calc_hge.mal 00_batcalc_hge.mal \
00_cluster_hge.mal 00_iterator_hge.mal 00_language_hge.mal \
00_mal_mapi_hge.mal 00_mkey_hge.mal 00_batExtensions_hge.mal
-
+
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = HAVE_GEOTIFF?geotiff HAVE_GDAL?gdal
+#SUBDIRS = HAVE_GEOTIFF?geotiff HAVE_GDAL?gdal
INCLUDES = ../../../include \
../../../common \
@@ -49,35 +49,35 @@ headers_autoload = {
SOURCES = 70_vault.mal
}
-lib__fits = {
- MODULE
- COND = HAVE_FITS
- DIR = libdir/monetdb5
- SOURCES = fits.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(cfitsio_LIBS)
-}
+#lib__fits = {
+# MODULE
+# COND = HAVE_FITS
+# DIR = libdir/monetdb5
+# SOURCES = fits.c
+# LIBS = ../../../../monetdb5/tools/libmonetdb5 \
+# $(cfitsio_LIBS)
+#}
-headers_fitsmal = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = fits.mal
-}
-
-headers_fitssql = {
- COND = HAVE_FITS
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 72_fits.sql
-}
-
-headers_fitsautoload = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 72_fits.mal
-}
+#headers_fitsmal = {
+# COND = HAVE_FITS
+# HEADERS = mal
+# DIR = libdir/monetdb5
+# SOURCES = fits.mal
+#}
+#
+#headers_fitssql = {
+# COND = HAVE_FITS
+# HEADERS = sql
+# DIR = libdir/monetdb5/createdb
+# SOURCES = 72_fits.sql
+#}
+#
+#headers_fitsautoload = {
+# COND = HAVE_FITS
+# HEADERS = mal
+# DIR = libdir/monetdb5/autoload
+# SOURCES = 72_fits.mal
+#}
EXTRA_DIST_DIR = Tests
EXTRA_DIST = 70_vault.mal 72_fits.mal \
diff --git a/sql/scripts/Makefile.ag b/sql/scripts/Makefile.ag
--- a/sql/scripts/Makefile.ag
+++ b/sql/scripts/Makefile.ag
@@ -36,7 +36,7 @@ headers_sql = {
24_zorder.sql \
25_debug.sql \
26_sysmon.sql \
- 29_array.sql
+ 29_array.sql \
39_analytics.sql \
40_json.sql \
41_jsonstore.sql \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
