Update of /cvsroot/monetdb/sql/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1819
Modified Files:
rules.msc
Log Message:
Use $(CLIENTS_INCLUDEDIR).
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/rules.msc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- rules.msc 28 Jan 2007 21:35:23 -0000 1.44
+++ rules.msc 24 May 2007 12:40:17 -0000 1.45
@@ -22,24 +22,16 @@
CONFIG_H=sql_config.h
MONETDB_INCLUDEDIR=$(MONETDB_PREFIX)\include
-MONETDB_INCS="-I$(MONETDB_INCLUDEDIR)" "-I$(MONETDB_INCLUDEDIR)\common"
"-I$(MONETDB_INCLUDEDIR)\gdk" "-I$(MONETDB_INCLUDEDIR)\monet"
"-I$(MONETDB_INCLUDEDIR)\plain" "-I$(MONETDB_INCLUDEDIR)\mapi"
-!IF [$(MAKE) /help 2>&1 | grep -q 6.]
-MONETDB_LIBS="/LIBPATH:$(MONETDB_PREFIX)\lib"
-MONETDB_MODS="/LIBPATH:$(MONETDB_PREFIX)\lib\MonetDB"
-!ELSE
-MONETDB_LIBS="\"/LIBPATH:$(MONETDB_PREFIX)\lib\""
-MONETDB_MODS="\"/LIBPATH:$(MONETDB_PREFIX)\lib\MonetDB\""
-!ENDIF
+MONETDB_INCS=-I"$(MONETDB_INCLUDEDIR)" -I"$(MONETDB_INCLUDEDIR)\common"
-I"$(MONETDB_INCLUDEDIR)\gdk" -I"$(MONETDB_INCLUDEDIR)\monet"
-I"$(MONETDB_INCLUDEDIR)\plain" -I"$(MONETDB_INCLUDEDIR)\mapi"
+MONETDB_LIBS=/libpath:"$(MONETDB_PREFIX)\lib"
+MONETDB_MODS=/libpath:"$(MONETDB_PREFIX)\lib\MonetDB"
-CLIENTS_INCS=-I$(TOPDIR)\..\..\clients\NT\include
-I$(TOPDIR)\..\..\clients\NT\include\MonetDB\mapilib
-!IF [$(MAKE) /help 2>&1 | grep -q 6.]
-CLIENTS_LIBS="/LIBPATH:$(CLIENTS_PREFIX)\lib"
-CLIENTS_MODS="/LIBPATH:$(CLIENTS_PREFIX)\lib\MonetDB"
-!ELSE
-CLIENTS_LIBS="\"/LIBPATH:$(CLIENTS_PREFIX)\lib\""
-CLIENTS_MODS="\"/LIBPATH:$(CLIENTS_PREFIX)\lib\MonetDB\""
-!ENDIF
+CLIENTS_INCLUDEDIR=$(CLIENTS_PREFIX)\include
+
+CLIENTS_INCS=-I"$(CLIENTS_INCLUDEDIR)"
-I"$(CLIENTS_INCLUDEDIR)\MonetDB\mapilib"
+CLIENTS_LIBS=/libpath:"$(CLIENTS_PREFIX)\lib"
+CLIENTS_MODS=/libpath:"$(CLIENTS_PREFIX)\lib\MonetDB"
!IFNDEF NO_MONETDB4
HAVE_MONETDB4=yes
@@ -47,28 +39,20 @@
!IFDEF HAVE_MONETDB4
MONETDB4_INCLUDEDIR=$(MONETDB4_PREFIX)\include
-MONETDB4_INCS="-I$(MONETDB4_INCLUDEDIR)" "-I$(MONETDB4_INCLUDEDIR)\monet"
"-I$(MONETDB4_INCLUDEDIR)\plain" "-I$(MONETDB4_INCLUDEDIR)\contrib"
"-I$(MONETDB4_INCLUDEDIR)\mapi"
-!IF [$(MAKE) /help 2>&1 | grep -q 6.]
-MONETDB4_LIBS="/LIBPATH:$(MONETDB4_PREFIX)\lib"
-MONETDB4_MODS="/LIBPATH:$(MONETDB4_PREFIX)\lib\MonetDB4"
-!ELSE
-MONETDB4_LIBS="\"/LIBPATH:$(MONETDB4_PREFIX)\lib\""
-MONETDB4_MODS="\"/LIBPATH:$(MONETDB4_PREFIX)\lib\MonetDB4\""
-!ENDIF
+
+MONETDB4_INCS=-I"$(MONETDB4_INCLUDEDIR)" -I"$(MONETDB4_INCLUDEDIR)\monet"
-I"$(MONETDB4_INCLUDEDIR)\plain" -I"$(MONETDB4_INCLUDEDIR)\contrib"
-I"$(MONETDB4_INCLUDEDIR)\mapi"
+MONETDB4_LIBS=/libpath:"$(MONETDB4_PREFIX)\lib"
+MONETDB4_MODS=/libpath:"$(MONETDB4_PREFIX)\lib\MonetDB4"
!ELSE
MONETDB4_INCS=
!ENDIF
!IFDEF HAVE_MONETDB5
MONETDB5_INCLUDEDIR=$(MONETDB5_PREFIX)\include
-MONETDB5_INCS="-I$(MONETDB5_INCLUDEDIR)" "-I$(MONETDB5_INCLUDEDIR)\atoms"
"-I$(MONETDB5_INCLUDEDIR)\compiler" "-I$(MONETDB5_INCLUDEDIR)\kernel"
"-I$(MONETDB5_INCLUDEDIR)\mal" "-I$(MONETDB5_INCLUDEDIR)\mil"
"-I$(MONETDB5_INCLUDEDIR)\optimizer" "-I$(MONETDB5_INCLUDEDIR)\scheduler"
-!IF [$(MAKE) /help 2>&1 | grep -q 6.]
-MONETDB5_LIBS="/LIBPATH:$(MONETDB5_PREFIX)\lib"
-MONETDB5_MODS="/LIBPATH:$(MONETDB5_PREFIX)\lib\MonetDB5"
-!ELSE
-MONETDB5_LIBS="\"/LIBPATH:$(MONETDB5_PREFIX)\lib\""
-MONETDB5_MODS="\"/LIBPATH:$(MONETDB5_PREFIX)\lib\MonetDB5\""
-!ENDIF
+
+MONETDB5_INCS=-I"$(MONETDB5_INCLUDEDIR)" -I"$(MONETDB5_INCLUDEDIR)\atoms"
-I"$(MONETDB5_INCLUDEDIR)\compiler" -I"$(MONETDB5_INCLUDEDIR)\kernel"
-I"$(MONETDB5_INCLUDEDIR)\mal" -I"$(MONETDB5_INCLUDEDIR)\mil"
-I"$(MONETDB5_INCLUDEDIR)\optimizer" -I"$(MONETDB5_INCLUDEDIR)\scheduler"
+MONETDB5_LIBS=/libpath:"$(MONETDB5_PREFIX)\lib"
+MONETDB5_MODS=/libpath:"$(MONETDB5_PREFIX)\lib\MonetDB5"
!ELSE
MONETDB5_INCS=
!ENDIF
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
