Changeset: e91ea139a4d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e91ea139a4d0
Modified Files:
gdk/Makefile.ag
geom/lib/Makefile.ag
monetdb5/extras/compiler/Makefile.ag
monetdb5/extras/compiler/mal_compiler.c
monetdb5/extras/crackers/Makefile.ag
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/sphinx/Makefile.ag
monetdb5/mal/Makefile.ag
monetdb5/mal/mal.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_stack.c
monetdb5/mal/mal_xml.h
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
monetdb5/optimizer/Makefile.ag
monetdb5/scheduler/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/vaults/mseed.c
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 2055 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/driver/SQLBrowseConnect.c
b/clients/odbc/driver/SQLBrowseConnect.c
--- a/clients/odbc/driver/SQLBrowseConnect.c
+++ b/clients/odbc/driver/SQLBrowseConnect.c
@@ -36,7 +36,6 @@
*
**********************************************************************/
-#include <monetdb_config.h>
#include "ODBCGlobal.h"
#include "ODBCDbc.h"
#include "ODBCUtil.h"
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -36,11 +36,10 @@
*
**********************************************************************/
-#include <monetdb_config.h>
-#include <monet_options.h>
#include "ODBCGlobal.h"
#include "ODBCDbc.h"
#include "ODBCUtil.h"
+#include <monet_options.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
diff --git a/clients/odbc/setup/drvcfg.c b/clients/odbc/setup/drvcfg.c
--- a/clients/odbc/setup/drvcfg.c
+++ b/clients/odbc/setup/drvcfg.c
@@ -28,6 +28,9 @@
* -----------------------------------------------
* Peter Harvey - [email protected]
**************************************************/
+
+#include "monetdb_config.h"
+
#include <drvcfg.h>
#include <string.h> /* for memset(), memcpy(), strncpy() */
diff --git a/clients/odbc/setup/drvcfg.h b/clients/odbc/setup/drvcfg.h
--- a/clients/odbc/setup/drvcfg.h
+++ b/clients/odbc/setup/drvcfg.h
@@ -31,8 +31,6 @@
#ifndef _ODBCINST_H
#define _ODBCINST_H
-#include "monetdb_config.h"
-
#include <unistd.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
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,28 +19,25 @@
INCLUDES = ../common/options ../common/stream ../common/utils
$(valgrind_CFLAGS)
-EXTRA_DIST = gdk.h gdk_cbp.h gdk_col.h gdk_delta.h \
-# gdk_logger.h \
- gdk_posix.h gdk_private.h gdk_qsort_impl.h gdk_rangejoin.h
gdk_ssort_impl.h gdk_storage.h gdk_system.h gdk_tm.h gdk_utils.h gdk_setop.h
-
lib_gdk = {
VERSION = $(GDK_VERSION)
NAME = bat
SOURCES = \
+ gdk.h gdk_private.h \
gdk_cast.c \
gdk_calc.c \
gdk_colop.c \
gdk_search.c \
- gdk_setop.c gdk_utils.c gdk_atoms.c \
+ gdk_setop.c gdk_setop.h gdk_utils.c gdk_utils.h gdk_atoms.c \
gdk_relop.c \
- gdk_tm.c gdk_align.c gdk_cbp.c \
+ gdk_tm.c gdk_tm.h gdk_align.c gdk_cbp.c gdk_cbp.h \
gdk_heap.c \
- gdk_qsort.c gdk_ssort.c gdk_storage.c gdk_col.c \
- gdk_delta.c \
- gdk_system.c gdk_value.c \
- gdk_rangejoin.c \
- gdk_posix.c \
-# gdk_logger.c \
+ gdk_qsort.c gdk_qsort_impl.h gdk_ssort.c gdk_ssort_impl.h
gdk_storage.c gdk_storage.h gdk_col.c gdk_col.h \
+ gdk_delta.c gdk_delta.h \
+ gdk_system.c gdk_system.h gdk_value.c \
+ gdk_rangejoin.c gdk_rangejoin.h \
+ gdk_posix.c gdk_posix.h \
+# gdk_logger.c gdk_logger.h \
bat.feps bat1.feps bat2.feps \
gdk_inspect.c \
libbat.rc
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -21,7 +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.mx
+ SOURCES = mal_compiler.c mal_compiler.h
LIBS = ../../tools/libmonetdb5 \
../../../gdk/libbat \
@@ -38,8 +38,8 @@
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = mal_compiler.mx
+ SOURCES = mal_compiler.mal
}
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 \
@@ -64,5 +64,4 @@
opt_sidcrack.mx
}
-#EXTRA_DIST_DIR = Tests
-EXTRA_DIST = # crackers_pq.h
+EXTRA_DIST_DIR = Tests
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_shredder.mx
+ SOURCES = rdf_shredder.mx rdf.h
}
-EXTRA_DIST = 10_rdf.mal rdf.mal 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.mx
+ SOURCES = sphinx.c sphinx.h
LIBS = ../../tools/libmonetdb5 $(SPHINXCLIENT_LIBS)
}
@@ -32,7 +32,7 @@
headers_sphinx_mal = {
HEADERS = mal
DIR = libdir/monetdb5
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
