Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23746/src/backends/monet5
Modified Files:
Makefile.ag
Removed Files:
monetdb5.py.i
Log Message:
to allow the usage of the most suitable CFLAGS & X_CFLAGS
for both out genuine (C-) code and SWIG-generated code,
we separate the latter from the former by moving it from
src/backends/monet[45]/ to src/backends/python/monet[45]/
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Makefile.ag,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.ag 8 Nov 2007 19:35:15 -0000 1.51
+++ Makefile.ag 22 Nov 2007 21:39:15 -0000 1.52
@@ -16,17 +16,8 @@
man_MANS = monetdb.1 merovingian.1
-SWIGFLAGS = $(MONETDB_INCS) $(CLIENTS_INCS)
INCLUDES = ../../include ../../common ../../storage ../../server \
- $(MONETDB5_INCS) $(CLIENTS_INCS) $(MONETDB_INCS) $(PYTHON_INCS)
-
-# Both GNU's gcc and Intel's icc do not like to compile swig-generated code
-# with our strict X_CFLAGS.
-# Instead of diabling the strict X_CFLAGS completely,
-# we use GCC_SWIG_CFLAGS and ICC_SWIG_CFLAGS, respectively,
-# to disable only the problematic warnings/errors as locally as possbile.
-# See buildtools/conf/MonetDB.m4 for details.
-CFLAGS = $(GCC_SWIG_CFLAGS) $(ICC_SWIG_CFLAGS)
+ $(MONETDB5_INCS) $(CLIENTS_INCS) $(MONETDB_INCS)
EXTRA_DIST = $(man_MANS)
@@ -67,25 +58,6 @@
SOURCES = embeddedclient.mx
}
-lib_monetdb5 = {
- COND = HAVE_PYTHON_SWIG
- PREFIX =
- NAME = _monetdb5
- SOURCES = monetdb5.py.i
- LIBS = libembeddedsql5 ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../common/libsqlcommon \
- $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet $(MONETDB5_LIBS)
-lmal \
- $(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(PYTHON_LIBS) $(READLINE_LIBS) $(PTHREAD_LIBS)
- DIR = $(prefix)/$(PYTHON_LIBDIR)
-}
-
-headers_py = {
- COND = HAVE_PYTHON_SWIG
- HEADERS = py
- SOURCES = monetdb5.py.i
- TARGETS = monetdb5.py
- DIR = $(prefix)/$(PYTHON_LIBDIR)
-}
-
headers_mal = {
HEADERS = mal
DIR = libdir/MonetDB5
--- monetdb5.py.i DELETED ---
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
