Changeset: d2fe0434e3f2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2fe0434e3f2
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
sql/backends/monet5/Makefile.ag
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 1229 to 300 lines):
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -24,7 +24,7 @@
}
bin_mclient = {
- SOURCES = mclient.c ReadlineTools.c
+ SOURCES = mclient.c ReadlineTools.c ReadlineTools.h
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
$(READLINE_LIBS) \
@@ -55,6 +55,6 @@
man_MANS = mclient.1 msqldump.1
-EXTRA_DIST = msqldump.h mprompt.h ReadlineTools.h $(man_MANS)
+EXTRA_DIST = msqldump.h mprompt.h $(man_MANS)
EXTRA_DIST_DIR = Tests
diff --git a/clients/odbc/winsetup/Makefile.ag
b/clients/odbc/winsetup/Makefile.ag
--- a/clients/odbc/winsetup/Makefile.ag
+++ b/clients/odbc/winsetup/Makefile.ag
@@ -24,7 +24,7 @@
ODBCLIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
lib_MonetODBCs = {
- SOURCES = setup.c setup.rc setup.syms
+ SOURCES = setup.c setup.rc setup.syms resource.h
LIBS = -lodbccp32 -luser32
}
diff --git a/common/options/Makefile.ag b/common/options/Makefile.ag
--- a/common/options/Makefile.ag
+++ b/common/options/Makefile.ag
@@ -19,10 +19,10 @@
MTSAFE
-EXTRA_DIST = monet_getopt.h getopt.c getopt1.c monet_options.h
+EXTRA_DIST = getopt.c getopt1.c
lib_moptions = {
NOINST
NAME = moptions
- SOURCES = monet_options.c monet_getopt.h
+ SOURCES = monet_options.c monet_options.h monet_getopt.h
}
diff --git a/common/stream/Makefile.ag b/common/stream/Makefile.ag
--- a/common/stream/Makefile.ag
+++ b/common/stream/Makefile.ag
@@ -19,15 +19,13 @@
MTSAFE
-EXTRA_DIST = stream_socket.h
-
INCLUDES = $(zlib_CFLAGS) \
$(BZ_CFLAGS) \
$(openssl_CFLAGS) \
$(curl_CFLAGS)
lib_stream = {
- SOURCES = stream.c stream.h
+ SOURCES = stream.c stream.h stream_socket.h
VERSION = $(STREAM_VERSION)
LIBS = $(SOCKET_LIBS) \
$(zlib_LIBS) \
diff --git a/common/utils/Makefile.ag b/common/utils/Makefile.ag
--- a/common/utils/Makefile.ag
+++ b/common/utils/Makefile.ag
@@ -19,9 +19,7 @@
MTSAFE
-EXTRA_DIST = mutils.h
-
lib_mutils = {
NOINST
- SOURCES = mutils.c
+ SOURCES = mutils.c mutils.h
}
diff --git a/de-bootstrap b/de-bootstrap
--- a/de-bootstrap
+++ b/de-bootstrap
@@ -70,4 +70,4 @@
exit 1
fi
-RM -rf `hg purge --all -p
-I{\*\*Makefile.\*,\*\*.pyc,aclocal.m4,acout.in,autom4te.cache,buildtools/conf/{config.{guess,sub},install-sh,ltmain.sh,l[ti]\*.m4,missing,ylwrap},configure{,.ac},{doc,install}.lst,monetdb_config.h.in}`
+RM -rf `hg --config extensions.purge= purge --all -p
-I{\*\*Makefile.\*,\*\*.pyc,aclocal.m4,acout.in,autom4te.cache,buildtools/conf/{config.{guess,sub},install-sh,ltmain.sh,l[ti]\*.m4,missing,ylwrap},configure{,.ac},{doc,install}.lst,monetdb_config.h.in}`
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -22,7 +22,6 @@
debian/tmp/usr/lib/monetdb5/bbp.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/blob.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/box.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/bpm.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/calc.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/chopper.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/clients.mal usr/lib/monetdb5
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -19,7 +19,7 @@
INCLUDES = ../common/options ../common/stream ../common/utils
$(valgrind_CFLAGS)
-EXTRA_DIST = gdk_scanselect_defs.mx gdk_private.h gdk_delta.h gdk_logger.h
gdk_posix.h gdk_system.h gdk_tm.h gdk_storage.h
+EXTRA_DIST = gdk_scanselect_defs.mx
lib_gdk = {
VERSION = $(GDK_VERSION)
@@ -41,7 +41,10 @@
gdk_qsort.mx gdk_ssort.mx gdk_storage.c gdk_bat.mx \
gdk_delta.c gdk_relop.mx gdk_system.c gdk_value.mx \
gdk_rangejoin.mx \
- gdk_posix.c gdk_logger.c bat.feps bat1.feps bat2.feps \
+ gdk_posix.c gdk_logger.c \
+ gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h \
+ gdk_system.h gdk_tm.h gdk_storage.h \
+ bat.feps bat1.feps bat2.feps \
libbat.rc
LIBS = ../common/options/libmoptions \
../common/stream/libstream \
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -1913,28 +1913,27 @@
char *color;
char *info;
} Encoding[] = {
- {
- '.', "0x00FFFDFE", "free"}, {
- '0', "0x000035FC", "thread stack space of thread 0"}, {
- '1', "0x000067FE", "thread stack space of thread 1"}, {
- '2', "0x000095FE", "thread stack space of thread 2"}, {
- '3', "0x0000BDFC", "thread stack space of thread 3"}, {
- '4', "0x0000DCF8", "thread stack space of thread 4"}, {
- '5', "0x002735FC", "thread stack space of thread 5"}, {
- '6', "0x002767FE", "thread stack space of thread 6"}, {
- '7', "0x002795FE", "thread stack space of thread 7"}, {
- '8', "0x0027BDFC", "thread stack space of thread 8"}, {
- '9', "0x0027DCF8", "thread stack space of thread 9"}, {
- 'B', "0x0000672D", "in use for a large BAT heap."}, {
- 'b', "0x004EF2A7", "free (last usage was B)"}, {
- 'S', "0x00B4006E", "in use for a malloc block"}, {
- 's', "0x00F2BDE0", "free (last usage was S)"}, {
- 'P', "0x00F26716", "in use for the BBP array"}, {
- 'p', "0x00F2BD16", "free (last usage was P)"}, {
- 'M', "0x00959516", "in use as memory mapped region"}, {
- 'm', "0x00CEDC16", "free (last usage was M)"}, {
- 'c', "0x00FFFD2D", "free (last usage was M)"}, {
- 0, "0x00FFFDFE", "free"}
+ {'.', "0x00FFFDFE", "free"},
+ {'0', "0x000035FC", "thread stack space of thread 0"},
+ {'1', "0x000067FE", "thread stack space of thread 1"},
+ {'2', "0x000095FE", "thread stack space of thread 2"},
+ {'3', "0x0000BDFC", "thread stack space of thread 3"},
+ {'4', "0x0000DCF8", "thread stack space of thread 4"},
+ {'5', "0x002735FC", "thread stack space of thread 5"},
+ {'6', "0x002767FE", "thread stack space of thread 6"},
+ {'7', "0x002795FE", "thread stack space of thread 7"},
+ {'8', "0x0027BDFC", "thread stack space of thread 8"},
+ {'9', "0x0027DCF8", "thread stack space of thread 9"},
+ {'B', "0x0000672D", "in use for a large BAT heap."},
+ {'b', "0x004EF2A7", "free (last usage was B)"},
+ {'S', "0x00B4006E", "in use for a malloc block"},
+ {'s', "0x00F2BDE0", "free (last usage was S)"},
+ {'P', "0x00F26716", "in use for the BBP array"},
+ {'p', "0x00F2BD16", "free (last usage was P)"},
+ {'M', "0x00959516", "in use as memory mapped region"},
+ {'m', "0x00CEDC16", "free (last usage was M)"},
+ {'c', "0x00FFFD2D", "free (last usage was M)"},
+ {0, "0x00FFFDFE", "free"}
};
#endif
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -21,6 +21,5 @@
lib_geom = {
NOINST
DIR = libdir/MonetDB
- SOURCES = libgeom.c
+ SOURCES = libgeom.c libgeom.h
}
-EXTRA_DIST = libgeom.h
diff --git a/monetdb5/extras/compiler/Makefile.ag
b/monetdb5/extras/compiler/Makefile.ag
--- a/monetdb5/extras/compiler/Makefile.ag
+++ b/monetdb5/extras/compiler/Makefile.ag
@@ -27,7 +27,7 @@
MODULE
DIR = libdir/monetdb5
SEP = _
- SOURCES = mal_compiler.c
+ SOURCES = mal_compiler.c mal_compiler.h
LIBS = ../../tools/libmonetdb5 \
../../../gdk/libbat \
@@ -42,4 +42,4 @@
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = mal_compiler.mal mal_compiler.h
+EXTRA_DIST = mal_compiler.mal
diff --git a/monetdb5/extras/compiler/mal_compiler.c
b/monetdb5/extras/compiler/mal_compiler.c
--- a/monetdb5/extras/compiler/mal_compiler.c
+++ b/monetdb5/extras/compiler/mal_compiler.c
@@ -65,16 +65,16 @@
* @example
* str MCCuser_tst903(void *tst903)
* {
- * BID *b= 0; /* bat[:void,:lng] */
- * void *V2= 0; /* void */
+ * BID *b= 0; // bat[:void,:lng]
+ * void *V2= 0; // void
* lng V3 = 0;
* bit go = 0;
* lng i = 0;
* lng V6 = 0;
* int k = 0;
* lng l = 0;
- * void *V9= 0; /* void */
- * void *V10= 0; /* void */
+ * void *V9= 0; // void
+ * void *V10= 0; // void
* lng V11 = 1;
* lng V12 = 1000000;
* str Xmsg = MAL_SUCCEED;
diff --git a/monetdb5/extras/crackers/Makefile.ag
b/monetdb5/extras/crackers/Makefile.ag
--- a/monetdb5/extras/crackers/Makefile.ag
+++ b/monetdb5/extras/crackers/Makefile.ag
@@ -44,7 +44,7 @@
crackers_joins.mx \
crackers_sortmerge.mx \
crackers_crackmerge.mx \
- crackers_pq.c \
+ crackers_pq.c crackers_pq.h \
crackers_populate.mx \
opt_crack.mx \
opt_selcrack.mx \
@@ -65,4 +65,3 @@
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = crackers_pq.h
diff --git a/monetdb5/extras/rdf/Makefile.ag b/monetdb5/extras/rdf/Makefile.ag
--- a/monetdb5/extras/rdf/Makefile.ag
+++ b/monetdb5/extras/rdf/Makefile.ag
@@ -27,6 +27,5 @@
lib_rdf = {
NOINST
DIR = libdir/monetdb5
- SOURCES = rdf.c rdf_shredder.mx
+ SOURCES = rdf_shredder.mx rdf.h
}
-EXTRA_DIST = rdf.h
diff --git a/monetdb5/extras/sphinx/Makefile.ag
b/monetdb5/extras/sphinx/Makefile.ag
--- a/monetdb5/extras/sphinx/Makefile.ag
+++ b/monetdb5/extras/sphinx/Makefile.ag
@@ -24,7 +24,7 @@
lib__sphinx = {
MODULE
DIR = libdir/monetdb5
- SOURCES = sphinx.c
+ SOURCES = sphinx.c sphinx.h
LIBS = ../../tools/libmonetdb5 $(SPHINXCLIENT_LIBS)
}
@@ -35,4 +35,4 @@
SOURCES = sphinx.mal
}
-EXTRA_DIST = sphinx.mal sphinx.h
+EXTRA_DIST = sphinx.mal
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -27,36 +27,37 @@
lib_mal = {
NOINST
SOURCES = \
- mal.c \
+ mal.c mal.h \
mal_atom.mx \
- mal_authorize.c \
+ mal_authorize.c mal_authorize.h \
mal_box.mx \
- mal_builder.c \
+ mal_builder.c mal_builder.h \
mal_client.mx \
mal_debugger.mx \
- mal_exception.c \
- mal_factory.c \
- mal_function.c \
+ mal_errors.h \
+ mal_exception.c mal_exception.h \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
