1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
From: Arto Jantunen <viiru@debian.org>
Date: Tue, 8 May 2012 14:19:20 +0300
Subject: [PATCH] Dynamically link the shp* binaries to libshp
Also use CPPFLAGS and LDFLAGS, necessary for hardening flags.
---
Makefile | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
Index: shapelib-1.2.10/Makefile
===================================================================
--- shapelib-1.2.10.orig/Makefile 2012-05-11 11:23:05.000000000 +0200
+++ shapelib-1.2.10/Makefile 2012-05-11 11:23:09.000000000 +0200
@@ -6,45 +6,36 @@
all: shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump shptest
-shpopen.o: shpopen.c shapefil.h
- $(CC) $(CFLAGS) -c shpopen.c
+shpcreate: shpcreate.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpcreate.c $(LINKOPT) -o shpcreate .libs/libshp.so
-shptree.o: shptree.c shapefil.h
- $(CC) $(CFLAGS) -c shptree.c
+shpadd: shpadd.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpadd.c $(LINKOPT) -o shpadd .libs/libshp.so
-dbfopen.o: dbfopen.c shapefil.h
- $(CC) $(CFLAGS) -c dbfopen.c
+shpdump: shpdump.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpdump.c $(LINKOPT) -o shpdump .libs/libshp.so
-shpcreate: shpcreate.c shpopen.o
- $(CC) $(CFLAGS) shpcreate.c shpopen.o $(LINKOPT) -o shpcreate
+shprewind: shprewind.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shprewind.c $(LINKOPT) -o shprewind .libs/libshp.so
-shpadd: shpadd.c shpopen.o
- $(CC) $(CFLAGS) shpadd.c shpopen.o $(LINKOPT) -o shpadd
+dbfcreate: dbfcreate.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) dbfcreate.c $(LINKOPT) -o dbfcreate .libs/libshp.so
-shpdump: shpdump.c shpopen.o
- $(CC) $(CFLAGS) shpdump.c shpopen.o $(LINKOPT) -o shpdump
+dbfadd: dbfadd.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) dbfadd.c $(LINKOPT) -o dbfadd .libs/libshp.so
-shprewind: shprewind.c shpopen.o
- $(CC) $(CFLAGS) shprewind.c shpopen.o $(LINKOPT) -o shprewind
+dbfdump: dbfdump.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) dbfdump.c $(LINKOPT) -o dbfdump .libs/libshp.so
-dbfcreate: dbfcreate.c dbfopen.o
- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o $(LINKOPT) -o dbfcreate
+shptest: shptest.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shptest.c $(LINKOPT) -o shptest .libs/libshp.so
-dbfadd: dbfadd.c dbfopen.o
- $(CC) $(CFLAGS) dbfadd.c dbfopen.o $(LINKOPT) -o dbfadd
+shputils: shputils.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shputils.c $(LINKOPT) -o shputils .libs/libshp.so
-dbfdump: dbfdump.c dbfopen.o
- $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump
-
-shptest: shptest.c shpopen.o
- $(CC) $(CFLAGS) shptest.c shpopen.o $(LINKOPT) -o shptest
-
-shputils: shputils.c shpopen.o dbfopen.o
- $(CC) $(CFLAGS) shputils.c shpopen.o dbfopen.o $(LINKOPT) -o shputils
-
-shptreedump: shptreedump.c shptree.o shpopen.o
- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o $(LINKOPT) \
- -o shptreedump
+shptreedump: shptreedump.c .libs/libshp.so
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shptreedump.c $(LINKOPT) \
+ -o shptreedump .libs/libshp.so
clean:
rm -f *.o dbfdump dbfcreate dbfadd shpdump shpcreate shpadd shputils
@@ -98,7 +89,9 @@
SHPLIB_VERSION=1.2.9
LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry
-lib:
+lib: .libs/libshp.so
+
+.libs/libshp.so:
libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CPPFLAGS) $(CFLAGS) -c shpopen.c
libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CPPFLAGS) $(CFLAGS) -c shptree.c
libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CPPFLAGS) $(CFLAGS) -c dbfopen.c
|
