Update of /cvsroot/monetdb/geom/NT
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28875/geom/NT
Modified Files:
Makefile
Log Message:
Implemented build directory support for Windows,
i.e., like on Unix/Linux also on Windows we can now build in a separate
build directory as alternative to ...\<package>\NT, and thus keep the
latter clean from files generated during the build.
As net effect, this allows to have multiple builds (e.g., different
compilers and/or BITS/OIDS settings using only one source tree
checkout (but separate build and prefix directories for each build).
Caveat:
On Windows, the build directory must be a sibling of ...\<package>\NT .
In essence, instead of
cd ...\<package>\NT
nmake /nologo ...
we can now do
mkdir ...\<package>\BUILD_DIR
cd ...\<package>\BUILD_DIR
nmake /nologo /f ..\NT\Makefile ...
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/geom/NT/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile 2 Feb 2010 15:27:43 -0000 1.13
+++ Makefile 24 Mar 2010 16:18:53 -0000 1.14
@@ -7,7 +7,7 @@
prefix = $(MAKEDIR)
-!INCLUDE "$(TOPDIR)\rules.msc"
+!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
!IFDEF HAVE_MONETDB5
M5INSTALLER = install-m5installer
@@ -27,15 +27,15 @@
!IFDEF BITS32
install-m5installer:
- $(INSTALL) MonetDB5-Geom\MonetDB5-Geom-Module.sln "$(prefix)"
- $(INSTALL) MonetDB5-Geom\MonetDB5-Geom-Module.vdproj "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-Geom\MonetDB5-Geom-Module.sln "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-Geom\MonetDB5-Geom-Module.vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" C:\cygwin\bin\sed.exe -i "s/Program
Files/Program Files (x86)/" "$(prefix)\MonetDB5-Geom-Module.vdproj"
!ENDIF
!IFDEF BITS64
install-m5installer:
- $(INSTALL) MonetDB5-Geom64\MonetDB5-Geom-Module.sln "$(prefix)"
- $(INSTALL) MonetDB5-Geom64\MonetDB5-Geom-Module.vdproj "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-Geom64\MonetDB5-Geom-Module.sln "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-Geom64\MonetDB5-Geom-Module.vdproj "$(prefix)"
!ENDIF
$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
@@ -43,8 +43,8 @@
all-msc: geom_config.h
-geom_config.h: geom_config.h.in
- $(CONFIGURE) geom_config.h.in > geom_config.h
+geom_config.h: ..\NT\geom_config.h.in
+ $(CONFIGURE) ..\NT\geom_config.h.in > geom_config.h
unistd.h:
$(ECHO) #ifndef UNISTD_H > unistd.h
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
