Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8067/src/backends/monet5
Modified Files:
Makefile.ag
Log Message:
Rename libmal to libmonetdb5.
There is a conflict with another libmal which is installed by default when KDE
is installed on Fedora.
Also, libmal doesn't quite cover the content: it contains more than just MAL.
U Makefile.ag
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Makefile.ag,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Makefile.ag 21 Jan 2008 18:00:05 -0000 1.56
+++ Makefile.ag 16 Apr 2008 11:26:25 -0000 1.57
@@ -33,7 +33,7 @@
sql_readline.mx \
sql_bpm.mx
LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
- $(MONETDB5_MODS) -l_blob -l_logger -l_mtime -l_bat5
-l_optimizer -l_tablet -l_bpm $(MONETDB5_LIBS) -lmal -l_mal_mapi \
+ $(MONETDB5_MODS) -l_blob -l_logger -l_mtime -l_bat5
-l_optimizer -l_tablet -l_bpm $(MONETDB5_LIBS) -lmonetdb5 -l_mal_mapi \
$(MONETDB_LIBS) -lbat -lstream $(READLINE_LIBS) $(PTHREAD_LIBS)
}
@@ -41,14 +41,14 @@
lib_embeddedsql5 = {
SOURCES = embeddedclient.mx
LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
- $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet -l_bpm
$(MONETDB5_LIBS) -lmal \
+ $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet -l_bpm
$(MONETDB5_LIBS) -lmonetdb5 \
$(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
}
bin_Mbeddedsql5 = {
SOURCES = prog.c
LIBS = libembeddedsql5 ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
- $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet -l_bpm
$(MONETDB5_LIBS) -lmal \
+ $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet -l_bpm
$(MONETDB5_LIBS) -lmonetdb5 \
$(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
}
@@ -67,7 +67,7 @@
bin_merovingian = {
COND = NOT_WIN32
SOURCES = merovingian.mx
- LIBS = $(MONETDB5_LIBS) -lmal @SHARED_LIBS@ $(MONETDB_LIBS) -lbat
-lstream \
+ LIBS = $(MONETDB5_LIBS) -lmonetdb5 @SHARED_LIBS@ $(MONETDB_LIBS) -lbat
-lstream \
$(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) \
$(MALLOC_LIBS)
}
@@ -75,7 +75,7 @@
bin_monetdb = {
COND = NOT_WIN32
SOURCES = monetdb.mx
- LIBS = $(MONETDB5_LIBS) -lmal @SHARED_LIBS@ $(MONETDB_LIBS) -lbat \
+ LIBS = $(MONETDB5_LIBS) -lmonetdb5 @SHARED_LIBS@ $(MONETDB_LIBS) -lbat \
$(MALLOC_LIBS)
}
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
