self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-25 01:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
postgis/loader/Makefile.in

62 lines
1.7 KiB
Makefile
Raw Normal View History

After several discussions at PGDay, it seems that the only use-case for the PGXS PROGRAM clause is for programs that wish to link with the backend libraries. Hence create a new Makefile for the loader directory which uses the new autoconf infrastructure, based upon library and dependency lists from the original 1.3 branch. git-svn-id: http://svn.osgeo.org/postgis/trunk@3143 b70326c6-7e19-0410-871a-916f4a2858ee
2008-10-19 14:52:29 +00:00
# **********************************************************************
# * $Id: Makefile.in
# *
# * PostGIS - Spatial Types for PostgreSQL
# * http://postgis.refractions.net
# * Copyright 2008 Mark Cave-Ayland
# *
# * This is free software; you can redistribute and/or modify it under
# * the terms of the GNU General Public Licence. See the COPYING file.
# *
# **********************************************************************
CC=@CC@
CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@
# Filenames with extension as determined by the OS
PGSQL2SHP=pgsql2shp@EXESUFFIX@
SHP2PGSQL=shp2pgsql@EXESUFFIX@
# Common shapefile library files
OBJS= shpopen.o \
dbfopen.o \
getopt.o
# PostgreSQL frontend CPPFLAGS and LDFLAGS (for compiling and linking with libpq)
PGSQL_FE_CPPFLAGS=@PGSQL_FE_CPPFLAGS@
PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@
# PostgreSQL executable directory
PGSQL_BINDIR=@PGSQL_BINDIR@
Add missing ICONV_LDFLAGS variable to the loader Makefile. Thanks to Olivier Courtin for noticing. git-svn-id: http://svn.osgeo.org/postgis/trunk@3225 b70326c6-7e19-0410-871a-916f4a2858ee
2008-11-03 16:23:45 +00:00
# iconv flags
ICONV_LDFLAGS=@ICONV_LDFLAGS@
After several discussions at PGDay, it seems that the only use-case for the PGXS PROGRAM clause is for programs that wish to link with the backend libraries. Hence create a new Makefile for the loader directory which uses the new autoconf infrastructure, based upon library and dependency lists from the original 1.3 branch. git-svn-id: http://svn.osgeo.org/postgis/trunk@3143 b70326c6-7e19-0410-871a-916f4a2858ee
2008-10-19 14:52:29 +00:00
all: $(SHP2PGSQL) $(PGSQL2SHP)
Alter loader Makefile to add liblwgeom.a dependency, so people who just want to build the shapefile loaders can do "make" within the loader subdirectory and liblwgeom.a will automagically get build first. git-svn-id: http://svn.osgeo.org/postgis/trunk@3235 b70326c6-7e19-0410-871a-916f4a2858ee
2008-11-04 09:57:03 +00:00
# liblwgeom.a dependency to allow "make install" in the loader/ subdirectory to work
../liblwgeom/liblwgeom.a:
make -C ../liblwgeom
After several discussions at PGDay, it seems that the only use-case for the PGXS PROGRAM clause is for programs that wish to link with the backend libraries. Hence create a new Makefile for the loader directory which uses the new autoconf infrastructure, based upon library and dependency lists from the original 1.3 branch. git-svn-id: http://svn.osgeo.org/postgis/trunk@3143 b70326c6-7e19-0410-871a-916f4a2858ee
2008-10-19 14:52:29 +00:00
pgsql2shp.o: pgsql2shp.c
$(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
Alter loader Makefile to add liblwgeom.a dependency, so people who just want to build the shapefile loaders can do "make" within the loader subdirectory and liblwgeom.a will automagically get build first. git-svn-id: http://svn.osgeo.org/postgis/trunk@3235 b70326c6-7e19-0410-871a-916f4a2858ee
2008-11-04 09:57:03 +00:00
$(PGSQL2SHP): ../liblwgeom/liblwgeom.a $(OBJS) pgsql2shp.o
Switch pgsql2shp over to using liblwgeom. There are few commits that can be as satisfying as one which involves the removal of ~1200 lines of code. By using the liblwgeom parser instead of the in-built parser, we have now achieved the following: i) all parsers within PostGIS, shp2pgsql and pgsql2shp are now the same which means they all follow the same rules. Also extended error reporting information including error text and position information is available. ii) the complexity of the shp2pgsql/pgsql2shp is considerably reduced. The slightly unfortunate cost is the overall executable size is larger, since we are linking with liblwgeom. However, from both a consistency and maintainability point of view, this is a big win. Note that while there may be a difference in behaviour in some corner cases, all regression tests pass here. git-svn-id: http://svn.osgeo.org/postgis/trunk@3224 b70326c6-7e19-0410-871a-916f4a2858ee
2008-11-03 16:17:57 +00:00
$(CC) $(CFLAGS) $(OBJS) pgsql2shp.o $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) ../liblwgeom/liblwgeom.a -lm -o $@
After several discussions at PGDay, it seems that the only use-case for the PGXS PROGRAM clause is for programs that wish to link with the backend libraries. Hence create a new Makefile for the loader directory which uses the new autoconf infrastructure, based upon library and dependency lists from the original 1.3 branch. git-svn-id: http://svn.osgeo.org/postgis/trunk@3143 b70326c6-7e19-0410-871a-916f4a2858ee
2008-10-19 14:52:29 +00:00
Alter loader Makefile to add liblwgeom.a dependency, so people who just want to build the shapefile loaders can do "make" within the loader subdirectory and liblwgeom.a will automagically get build first. git-svn-id: http://svn.osgeo.org/postgis/trunk@3235 b70326c6-7e19-0410-871a-916f4a2858ee
2008-11-04 09:57:03 +00:00
$(SHP2PGSQL): ../liblwgeom/liblwgeom.a $(OBJS) shp2pgsql.o
Switch shp2pgsql over to use liblwgeom instead of its own internal parser. Some notes from looking at the code: i) I've abstracted the I/O formatting functions into a new OutputGeometry() function since it allow the logic concerning output formatting to kept in one place, rather than sprinkled throughout all the other Insert* functions. ii) InsertPoint() and InsertMultiPoint() have been combined, since it seems that the same code will work for both - all that is required is to know whether to produce a MULTIPOINT collecton or a POINT at the end. iii) I've added additional comments within the Insert* functions to help clarify what is going on in places iv) It appears some corner cases were missing within the conversion code with respect to Z/M coordinates, so in theory the new code should do a better job. All in all, the source code is slightly reduced in size (although of course the binary is larger after linking with liblwgeom), and seems a lot more readable to my eyes. A quick TODO is to go through the file and replace the #if...#endif sections related to debugging with LWDEBUG(F) options. NOTE: I've had to change the Makefile to allow linking against the maths library and liblwgeom.a, so some manual intervention on the automated build may be required ;) git-svn-id: http://svn.osgeo.org/postgis/trunk@3217 b70326c6-7e19-0410-871a-916f4a2858ee
2008-10-30 17:10:44 +00:00
$(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(ICONV_LDFLAGS) ../liblwgeom/liblwgeom.a -lm -o $@
After several discussions at PGDay, it seems that the only use-case for the PGXS PROGRAM clause is for programs that wish to link with the backend libraries. Hence create a new Makefile for the loader directory which uses the new autoconf infrastructure, based upon library and dependency lists from the original 1.3 branch. git-svn-id: http://svn.osgeo.org/postgis/trunk@3143 b70326c6-7e19-0410-871a-916f4a2858ee
2008-10-19 14:52:29 +00:00
install: all
cp $(PGSQL2SHP) $(PGSQL_BINDIR)/$(PGSQL2SHP)
cp $(SHP2PGSQL) $(PGSQL_BINDIR)/$(SHP2PGSQL)
uninstall:
rm -f $(PGSQL_BINDIR)/$(PGSQL2SHP)
rm -f $(PGSQL_BINDIR)/$(SHP2PGSQL)
clean:
rm -f $(OBJS) shp2pgsql.o pgsql2shp.o $(SHP2PGSQL) $(PGSQL2SHP)
Reference in a new issue Copy permalink