From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Mon, 5 Mar 2012 23:09:24 +0000 (+0000)
Subject: Rename LOADER_OBJS to the more direct SHPLIB_OBJS
X-Git-Tag: 2.0.0beta2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13946af983959a939ea8d9ddbf560f1af6f310e6;p=postgis

Rename LOADER_OBJS to the more direct SHPLIB_OBJS


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

diff --git a/loader/Makefile.in b/loader/Makefile.in
index b19d1f661..b15992657 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -72,7 +72,7 @@ endif
 gtk_build = @GTK_BUILD@
 
 # Common object files
-LOADER_OBJS = shpopen.o dbfopen.o getopt.o shpcommon.o safileio.o
+SHPLIB_OBJS = shpopen.o dbfopen.o getopt.o shpcommon.o safileio.o
 
 # The real parts of the Makefile
 all: $(SHP2PGSQL-CLI) $(PGSQL2SHP-CLI) @GTK_BUILD@
@@ -96,12 +96,12 @@ pgsql2shp-core.o: pgsql2shp-core.c pgsql2shp-core.h shpcommon.h
 pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2shp-core.h shpcommon.h
 	$(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
 
-$(PGSQL2SHP-CLI): $(LOADER_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) 
+$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) 
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ \
 	  $(LIBTOOL_LINK_COMMANDS)
 
-$(SHP2PGSQL-CLI): $(LOADER_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) 
+$(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) 
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) \
 	  $(LIBTOOL_LINK_COMMANDS)
@@ -109,7 +109,7 @@ $(SHP2PGSQL-CLI): $(LOADER_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
 shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
 	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
 
-$(SHP2PGSQL-GUI): $(LOADER_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
+$(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) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) \