Loader: Use static instead of static-libtool

We should only care about uninstalled libraries (liblwgeom)

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

diff --git a/loader/Makefile.in b/loader/Makefile.in
index d9737bf027ee06b1385371b235fdcc9d8310d85e..416d034e9336f70073df5cfa2bbdaf07240faa66 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -43,6 +43,7 @@ ICONV_CFLAGS=@ICONV_CFLAGS@
 
 # liblwgeom
 LIBLWGEOM=../liblwgeom/liblwgeom.la
+LDFLAGS += -static $(LIBLWGEOM)
 
 # GTK includes and libraries
 GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
@@ -97,11 +98,11 @@ pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2shp-core.h shpcommon.h
 
 $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
        $(LIBTOOL) --mode=link \
-         $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ -static-libtool-libs
+         $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
 
 $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
        $(LIBTOOL) --mode=link \
-         $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) -static-libtool-libs
+         $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
 
 shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
        $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
@@ -109,7 +110,7 @@ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
 $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
        $(LIBTOOL) --mode=link \
          $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
-         $(GTK_LIBS) $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -static-libtool-libs
+         $(GTK_LIBS) $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
 
 installdir:
        @mkdir -p $(DESTDIR)$(bindir)