Changeset: 7cfa0e4ef949 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7cfa0e4ef949
Modified Files:
monetdb5/extras/compiler/mal_compiler.c
monetdb5/modules/mal/Makefile.ag
monetdb5/optimizer/Makefile.ag
monetdb5/scheduler/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/UDF/Makefile.ag
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 676 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/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/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 \
+ mal_factory.c mal_factory.h \
+ mal_function.c mal_function.h \
mal_import.mx \
mal_instruction.mx \
mal_interpreter.mx \
- mal_linker.c \
+ mal_linker.c mal_linker.h \
mal_module.mx \
- mal_namespace.c \
+ mal_namespace.c mal_namespace.h \
mal_parser.mx \
mal_profiler.mx \
- mal_properties.c \
+ mal_properties.c mal_properties.h \
mal_readline.mx \
- mal_recycle.c \
+ mal_recycle.c mal_recycle.h \
mal_resolve.mx \
- mal_sabaoth.c \
- mal_scenario.c \
- mal_session.c \
- mal_stack.c \
- mal_type.c \
- mal_utils.c \
- mal_xml.c
+ mal_sabaoth.c mal_sabaoth.h \
+ mal_scenario.c mal_scenario.h \
+ mal_session.c mal_session.h \
+ mal_stack.c mal_stack.h \
+ mal_type.c mal_type.h \
+ mal_utils.c mal_utils.h \
+ mal_xml.c mal_xml.h
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = mal.mal mal.h mal_authorize.h mal_builder.h mal_errors.h
mal_exception.h mal_factory.h mal_function.h mal_linker.h mal_namespace.h
mal_properties.h mal_recycle.h mal_sabaoth.h mal_scenario.h mal_session.h
mal_stack.h mal_type.h mal_utils.h mal_xml.h
+EXTRA_DIST = mal.mal
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -26,15 +26,15 @@
NOINST
SOURCES = \
batxml.mx \
- blob.c \
- color.c \
- identifier.c \
- inet.c \
+ blob.c blob.h \
+ color.c color.h \
+ identifier.c identifier.h \
+ inet.c inet.h \
mtime.mx \
streams.mx \
str.mx \
url.mx \
- xml.c
+ xml.c xml.h
}
headers_mal = {
@@ -54,4 +54,4 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
