Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23746/src/backends/monet4
Modified Files:
Makefile.ag
Removed Files:
monetdb.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/monet4/Makefile.ag,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile.ag 17 Nov 2007 16:32:55 -0000 1.42
+++ Makefile.ag 22 Nov 2007 21:39:15 -0000 1.43
@@ -16,17 +16,8 @@
MTSAFE
-SWIGFLAGS = $(MONETDB_INCS) $(CLIENTS_INCS)
INCLUDES = ../../include ../../common ../../storage ../../server \
- $(MONETDB4_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)
+ $(MONETDB4_INCS) $(CLIENTS_INCS) $(MONETDB_INCS)
GDK_LIBS = $(PTHREAD_LIBS) $(MALLOC_LIBS)
EXTRA_LIBS = $(SOCKET_LIBS) $(DL_LIBS) $(GDK_LIBS)
@@ -117,23 +108,4 @@
SOURCES = embeddedclient.mx
}
-lib_monetdb = {
- COND = HAVE_PYTHON_SWIG
- PREFIX =
- NAME = _monetdb
- SOURCES = monetdb.py.i
- LIBS = libinitmodules STATIC_MODS @SHARED_LIBS@ lib_sql_server
$(EXTRA_LIBS) \
- libembeddedsql \
- $(MONETDB_LIBS) -lbat -lmutils -lstream $(MONETDB4_LIBS)
-lmonet $(CLIENTS_LIBS) -lMapi $(PYTHON_LIBS)
- DIR = $(prefix)/$(PYTHON_LIBDIR)
-}
-
-headers_py = {
- COND = HAVE_PYTHON_SWIG
- HEADERS = py
- SOURCES = monetdb.py.i
- TARGETS = monetdb.py
- DIR = $(prefix)/$(PYTHON_LIBDIR)
-}
-
EXTRA_DIST_DIR = Tests
--- monetdb.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
