Author: qboosh Date: Thu Oct 20 22:14:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - Makefile fixes
---- Files affected: SOURCES: shapelib-make.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/shapelib-make.patch diff -u /dev/null SOURCES/shapelib-make.patch:1.1 --- /dev/null Fri Oct 21 00:14:14 2005 +++ SOURCES/shapelib-make.patch Fri Oct 21 00:14:09 2005 @@ -0,0 +1,124 @@ +--- shapelib-1.2.10/Makefile.orig 2003-04-07 15:03:22.000000000 +0200 ++++ shapelib-1.2.10/Makefile 2005-10-20 23:55:28.785757568 +0200 +@@ -1,6 +1,8 @@ + + #LINKOPT = /usr/local/lib/libdbmalloc.a + CFLAGS = -g ++libdir = /usr/local/lib ++includedir = /usr/local/include + + default: all + +@@ -15,35 +17,35 @@ + dbfopen.o: dbfopen.c shapefil.h + $(CC) $(CFLAGS) -c dbfopen.c + +-shpcreate: shpcreate.c shpopen.o +- $(CC) $(CFLAGS) shpcreate.c shpopen.o $(LINKOPT) -o shpcreate ++shpcreate: shpcreate.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shpcreate.c libshp.la $(LINKOPT) -o shpcreate + +-shpadd: shpadd.c shpopen.o +- $(CC) $(CFLAGS) shpadd.c shpopen.o $(LINKOPT) -o shpadd ++shpadd: shpadd.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shpadd.c libshp.la $(LINKOPT) -o shpadd + +-shpdump: shpdump.c shpopen.o +- $(CC) $(CFLAGS) shpdump.c shpopen.o $(LINKOPT) -o shpdump ++shpdump: shpdump.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shpdump.c libshp.la $(LINKOPT) -o shpdump + +-shprewind: shprewind.c shpopen.o +- $(CC) $(CFLAGS) shprewind.c shpopen.o $(LINKOPT) -o shprewind ++shprewind: shprewind.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shprewind.c libshp.la $(LINKOPT) -o shprewind + +-dbfcreate: dbfcreate.c dbfopen.o +- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o $(LINKOPT) -o dbfcreate ++dbfcreate: dbfcreate.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) dbfcreate.c libshp.la $(LINKOPT) -o dbfcreate + +-dbfadd: dbfadd.c dbfopen.o +- $(CC) $(CFLAGS) dbfadd.c dbfopen.o $(LINKOPT) -o dbfadd ++dbfadd: dbfadd.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) dbfadd.c libshp.la $(LINKOPT) -o dbfadd + +-dbfdump: dbfdump.c dbfopen.o +- $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump ++dbfdump: dbfdump.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) dbfdump.c libshp.la $(LINKOPT) -o dbfdump + +-shptest: shptest.c shpopen.o +- $(CC) $(CFLAGS) shptest.c shpopen.o $(LINKOPT) -o shptest ++shptest: shptest.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shptest.c libshp.la $(LINKOPT) -o shptest + +-shputils: shputils.c shpopen.o dbfopen.o +- $(CC) $(CFLAGS) shputils.c shpopen.o dbfopen.o $(LINKOPT) -o shputils ++shputils: shputils.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shputils.c libshp.la $(LINKOPT) -o shputils + +-shptreedump: shptreedump.c shptree.o shpopen.o +- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o $(LINKOPT) \ ++shptreedump: shptreedump.c libshp.la ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) shptreedump.c libshp.la $(LINKOPT) \ + -o shptreedump + + clean: +@@ -98,45 +100,16 @@ + SHPLIB_VERSION=1.2.9 + LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry + +-lib: +- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c +- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo +- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1 +- mv -f .libs/shpopen.lo shpopen.lo +- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c +- rm -f .libs/shptree.lo +- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c -o .libs/shptree.lo +- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1 +- mv -f .libs/shptree.lo shptree.lo +- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c +- rm -f .libs/dbfopen.lo +- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo +- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 +- mv -f .libs/dbfopen.lo dbfopen.lo +- /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo +- rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* +- rm -fr .libs/libshp.lax +- mkdir .libs/libshp.lax +- /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc +- +- (cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) +- (cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) +- ar cru .libs/libshp.a shpopen.o shptree.o dbfopen.o +- ranlib .libs/libshp.a +- rm -fr .libs/libshp.lax +- (cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la) ++lib: libshp.la ++ ++libshp.la: ++ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shpopen.c ++ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shptree.c ++ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c dbfopen.c ++ /bin/sh ./libtool --mode=link $(CC) -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo + + lib_install: +- cp .libs/libshp.la .libs/libshp.lai +- /bin/sh ./mkinstalldirs /usr/local/lib +- /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la +- /usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) +- (cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) +- (cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) +- chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION) +- /usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la +- /usr/bin/install -c .libs/libshp.a /usr/local/lib/libshp.a +- ranlib /usr/local/lib/libshp.a +- chmod 644 /usr/local/lib/libshp.a +- /bin/sh ./mkinstalldirs /usr/local/include/libshp +- /usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h ++ /bin/sh ./mkinstalldirs $(DESTDIR)$(libdir) ++ /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la $(DESTDIR)$(libdir)/libshp.la ++ /bin/sh ./mkinstalldirs $(DESTDIR)$(includedir)/libshp ++ /usr/bin/install -c -m 644 shapefil.h $(DESTDIR)$(includedir)/libshp/shapefil.h ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
