[geos-commits] r2845 - in trunk: . src

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-01-13 12:54:37 -0500 (Wed, 13 Jan 2010)
New Revision: 2845

Modified:
   trunk/makefile.vc
   trunk/nmake.opt
   trunk/src/Makefile.vc
Log:
Updated makefile.vc, nmake.opt, src/makefile.vc files with new location of include and src (#315)

Modified: trunk/makefile.vc
===================================================================
--- trunk/makefile.vc	2010-01-13 03:03:38 UTC (rev 2844)
+++ trunk/makefile.vc	2010-01-13 17:54:37 UTC (rev 2845)
@@ -2,7 +2,7 @@
 #
 # NMAKE Makefile to build GEOS on Windows
 ###############################################################################
-# This makefile.vc delegates making targets to source\makefile.vc
+# This makefile.vc delegates making targets to src\makefile.vc
 # so it's just a thin wrapper.
 #
 # 	Building on Win32 with Visual Studio
@@ -12,21 +12,21 @@
 # 2) Build running command "nmake /f makefile.vc" in top-level directory
 #
 # Produces:
-#  source\geos.dll: DLL - only exports the C API
-#  source\geos_i.lib: Stub library to link against for use of geos.dll. 
-#  source\geos.lib: static library for use of C or C++ API.
+#  src\geos.dll: DLL - only exports the C API
+#  src\geos_i.lib: Stub library to link against for use of geos.dll. 
+#  src\geos.lib: static library for use of C or C++ API.
 ###############################################################################
 GEOS_ROOT=.
 !INCLUDE $(GEOS_ROOT)\nmake.opt
 
-default: source_dir
+default: src_dir
 
-source_dir:
-	cd source
+src_dir:
+	cd src
 	$(MAKE) /f makefile.vc
 	cd ..
 
 clean:	
-	cd source
+	cd src
 	$(MAKE) /f makefile.vc clean
 	cd ..

Modified: trunk/nmake.opt
===================================================================
--- trunk/nmake.opt	2010-01-13 03:03:38 UTC (rev 2844)
+++ trunk/nmake.opt	2010-01-13 17:54:37 UTC (rev 2845)
@@ -89,7 +89,7 @@
 ###############################################################################
 # Include directories
 
-GEOS_INCLUDE = -Iheaders -I..\capi
+GEOS_INCLUDE = -I..\include -I..\capi
 
 !MESSAGE *** Setting GEOS_INCLUDE $(GEOS_INCLUDE)
 !MESSAGE *** Setting INCLUDE $(INCLUDE)

Modified: trunk/src/Makefile.vc
===================================================================
--- trunk/src/Makefile.vc	2010-01-13 03:03:38 UTC (rev 2844)
+++ trunk/src/Makefile.vc	2010-01-13 17:54:37 UTC (rev 2845)
@@ -307,7 +307,7 @@
 	TestSweepLineSpeed.exe
 	
 
-$(LIBNAME):	headers/geos/platform.h headers/geos/version.h ../capi/geos_c.h $(OBJ)
+$(LIBNAME):	$(GEOS_ROOT)\include\geos\platform.h $(GEOS_ROOT)\include\geos\version.h ..\capi\geos_c.h $(OBJ)
 	if exist $(LIBNAME) del $(LIBNAME)
 	$(LINK) /lib /out:$(LIBNAME) $(OBJ)
 
@@ -319,11 +319,11 @@
 	$(LINK) /dll /debug ..\capi\geos_c.obj ..\capi\geos_ts_c.obj $(LIBNAME) /out:$(CDLLNAME) /implib:$(CLIBNAME)
 	if exist $(CDLLNAME).manifest mt -manifest $(CDLLNAME).manifest -outputresource:$(CDLLNAME);2
   
-headers/geos/platform.h: headers/geos/platform.h.vc
-	$(CP) headers\geos\platform.h.vc headers\geos\platform.h
+$(GEOS_ROOT)\include\geos\platform.h: $(GEOS_ROOT)\include\geos\platform.h.vc
+	$(CP) $(GEOS_ROOT)\include\geos\platform.h.vc $(GEOS_ROOT)\include\geos\platform.h
 
-headers/geos/version.h: headers/geos/version.h.vc
-	if not exist headers\geos\version.h $(CP) headers\geos\version.h.vc headers\geos\version.h
+$(GEOS_ROOT)\include\geos\version.h: $(GEOS_ROOT)\include\geos\version.h.vc
+	if not exist $(GEOS_ROOT)\include\geos\version.h $(CP) $(GEOS_ROOT)\include\geos\version.h.vc $(GEOS_ROOT)\include\geos\version.h
 
 # geos_c.h should already be in distribution, if is not you'll
 # have to run ./configure to recreate