Reworked build scripts.

git-svn-id: http://svn.osgeo.org/postgis/trunk@842 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..0c278bc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,94 @@
+#---------------------------------------------------------------
+# Configuration Directives
+#---------------------------------------------------------------
+
+#
+# We recommend that you install the Proj4 and GEOS libraries
+# referenced below to get the most use out of your PostGIS
+# database.
+
+#
+# Set USE_PROJ to 1 for Proj4 reprojection support (recommended)
+#
+# Reprojection allows you to transform coordinate systems
+# in the database with the Transform() function.
+#
+# Download from: http://www.remotesensing.org/proj
+#
+USE_PROJ=1
+ifeq (${PROJ_DIR},) 
+       PROJ_DIR=/usr/local
+endif
+
+#
+# Set USE_GEOS to 1 for GEOS spatial predicate and operator
+# support (recommended).
+# GEOS installation directory defaults to /usr/local,
+# set GEOS_DIR environment variable to change it.
+#
+# GEOS allows you to do exact topological tests, such as
+# Intersects() and Touches(), as well as geometry operations,
+# such as Buffer(), GeomUnion() and Difference().
+#
+# Download from: http://geos.refractions.net
+#
+USE_GEOS=1
+ifeq (${GEOS_DIR},) 
+       GEOS_DIR=/usr/local
+endif
+
+#
+# Set USE_STATS to 1 for new GiST statistics collection support
+# Note that this support requires additional columns in 
+# GEOMETRY_COLUMNS, so see the list archives for info or
+# install a fresh database using postgis.sql
+#
+USE_STATS=1
+
+#
+# Root of the PostgreSQL source tree 
+# If you are not building from within postgresql 'contrib' directory
+# set the PGSQL_SRC either below or in the environment (an absolute path).
+#
+# PGSQL_SRC=/usr/src/postgresql
+
+#
+# Path to library (to be specified in CREATE FUNCTION queries)
+# Defaults to $libdir.
+# Set LPATH below or in the environment to change it.
+#
+# LPATH=/usr/src/postgis
+
+#---------------------------------------------------------------
+# END OF CONFIGURATION
+#---------------------------------------------------------------
+
+export USE_GEOS
+export GEOS_DIR
+export USE_STATS
+export USE_PROJ
+export PGSQL_SRC
+
+all: liblwgeom loaderdumper
+
+install: all liblwgeom-install loaderdumper-install
+
+clean: liblwgeom-clean loaderdumper-clean
+
+liblwgeom: 
+       $(MAKE) -C lwgeom
+
+liblwgeom-clean:
+       $(MAKE) -C lwgeom clean
+
+liblwgeom-install:
+       $(MAKE) -C lwgeom install
+
+loaderdumper:
+       $(MAKE) -C loader
+
+loaderdumper-clean:
+       $(MAKE) -C loader clean
+
+loaderdumper-install:
+       $(MAKE) -C loader install

diff --git a/hwgeom/Makefile b/hwgeom/Makefile
index f1bd9a1dec5f26e5903dfac4653d0161af0359eb..339287715d410d037127eb088d1c2f0d0135fba5 100644 (file)
--- a/hwgeom/Makefile
+++ b/hwgeom/Makefile
@@ -1,49 +1,9 @@
 #---------------------------------------------------------------
 # Configuration Directives
 #
-# We recommend that you install the Proj4 and GEOS libraries
-# referenced below to get the most use out of your PostGIS
-# database.
-
-#---------------------------------------------------------------
-# Set USE_PROJ to 1 for Proj4 reprojection support (recommended)
-#
-# Reprojection allows you to transform coordinate systems
-# in the database with the Transform() function.
-#
-# Download from: http://www.remotesensing.org/proj
-#
-USE_PROJ=1
-ifeq (${PROJ_DIR},) 
-       PROJ_DIR=/usr/local
-endif
-
-#---------------------------------------------------------------
-# Set USE_GEOS to 1 for GEOS spatial predicate and operator
-# support (recommended)
-#
-# GEOS allows you to do exact topological tests, such as
-# Intersects() and Touches(), as well as geometry operations,
-# such as Buffer(), GeomUnion() and Difference().
-#
-# Download from: http://geos.refractions.net
-#
-USE_GEOS=1
-ifeq (${GEOS_DIR},) 
-       GEOS_DIR=/usr/local
-endif
-
-#---------------------------------------------------------------
-# Set USE_STATS to 1 for new GiST statistics collection support
-# Note that this support requires additional columns in 
-# GEOMETRY_COLUMNS, so see the list archives for info or
-# install a fresh database using postgis.sql
-#
-USE_STATS=1
 
 #---------------------------------------------------------------
 subdir=contrib/postgis
-
 #---------------------------------------------------------------
 # Default the root of the PostgreSQL source tree 
 # To use a non-standard location set the PGSQL_SRC environment
@@ -232,7 +192,7 @@ endif # not win
 #----------------------------------------------------------
 
 detect_geos_version: 
-       ./geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
+       ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
 
 installdirs:
        $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index f30e5aa26947ed5c6658da47c3f4a8de30c770da..f5638d2ff0f54d0da6d5b4a458a16d46fd17d308 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -1,29 +1,5 @@
 # Configuration Directives
 
-#---------------------------------------------------------------
-# Set USE_PROJ to 1 for Proj4 reprojection support
-#
-USE_PROJ=1
-ifeq (${PROJ_DIR},) 
-       PROJ_DIR=/usr/local
-endif
-
-#---------------------------------------------------------------
-# Set USE_GEOS to 1 for GEOS spatial predicate and operator
-# support
-#
-USE_GEOS=1
-ifeq (${GEOS_DIR},) 
-       GEOS_DIR=/usr/local
-endif
-
-#---------------------------------------------------------------
-# Set USE_STATS to 1 for new GiST statistics collection support
-# Note that this support requires additional columns in 
-# GEOMETRY_COLUMNS, so see the list archives for info or
-#
-USE_STATS=1
-
 #---------------------------------------------------------------
 subdir=contrib/postgis
 #---------------------------------------------------------------
@@ -101,8 +77,7 @@ POSTGIS_LIB_VERSION = $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_MICRO_VERSION
 
 #---------------------------------------------------------------
 
-override CFLAGS += -g 
-
+override CFLAGS += -g -fexceptions
 override CFLAGS += -I$(srcdir) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' 
 override CFLAGS += -DUSE_VERSION=$(USE_VERSION)
 override CFLAGS += -DPOSTGIS_LIB_VERSION='"$(POSTGIS_LIB_VERSION)"'