Move stringbuffer from ./loader to ./liblwgeom for use in string emitter functions.

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

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 7e4bc3a9bc9cb6e1426efc6a9c0f2f7b63e8ea88..0ec1d629171e16d04a79ab52049bb15f7d19b970 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -19,6 +19,7 @@ LEX=@LEX@
 
 # Standalone LWGEOM objects
 SA_OBJS = \
+       stringbuffer.o \
        measures.o \
        box2d.o \
        ptarray.o \

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index e098dac0ccf2b8d073c958616278c33db5c2f105..faeccee937cdbec0d0afb9a0f5eef994a112efcd 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h
@@ -16,6 +16,7 @@
 #define _LIBLWGEOM_H 1
 
 #include "../postgis_config.h"
+#include "stringbuffer.h"
 #include <stdarg.h>
 #include <stdio.h>
 

diff --git a/loader/stringbuffer.c b/liblwgeom/stringbuffer.c
similarity index 100%
rename from loader/stringbuffer.c
rename to liblwgeom/stringbuffer.c

diff --git a/loader/stringbuffer.h b/liblwgeom/stringbuffer.h
similarity index 100%
rename from loader/stringbuffer.h
rename to liblwgeom/stringbuffer.h

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 62d31a95eb297433ba9e6a73ec42d41ea4c99de1..3692dc9b4188082e6085cf6ba8c7a5f8361f8365 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -81,13 +81,13 @@ pgsql2shp.o: pgsql2shp.c
 $(PGSQL2SHP): shpopen.o dbfopen.o getopt.o pgsql2shp.o $(LIBLWGEOM) 
        $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@ 
 
-$(SHP2PGSQL-CLI): stringbuffer.o shpopen.o dbfopen.o getopt.o shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) 
+$(SHP2PGSQL-CLI): shpopen.o dbfopen.o getopt.o shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) 
        $(CC) $(CFLAGS) $^ -o $@ $(ICONV_LDFLAGS) -lm 
 
 shp2pgsql-gui.o: shp2pgsql-gui.c
        $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c
 
-$(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES)
+$(SHP2PGSQL-GUI): shpopen.o dbfopen.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES)
        $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm 
 
 installdir:

diff --git a/loader/shp2pgsql-core.h b/loader/shp2pgsql-core.h
index 7ee0383ce22fc9a83ec49fec0fbeea43d145e4fc..a2b6d52406277719e7fa62bc28353ca6c0dd89f5 100644 (file)
--- a/loader/shp2pgsql-core.h
+++ b/loader/shp2pgsql-core.h
@@ -27,8 +27,6 @@
 
 #include "../liblwgeom/liblwgeom.h"
 
-#include "stringbuffer.h"
-
 #define RCSID "$Id$"