Package: gpscorrelate / 1.6.1-7

10-build-fixes.patch Patch series | download
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
Description: Adapt Makefile to Debian package.
Author: Євгеній Мещеряков <eugen@debian.org>
Last-Update: 2010-02-22

Index: gpscorrelate/Makefile
===================================================================
--- gpscorrelate.orig/Makefile	2010-02-22 12:56:50.000000000 +0100
+++ gpscorrelate/Makefile	2010-02-22 16:29:37.631626442 +0100
@@ -7,7 +7,8 @@
 CFLAGS   = -Wall
 override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
 OFLAGS   = -Wall
-override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
+OFLAGS_CON = $(OFLAGS) -Wl,--as-needed $(shell pkg-config --libs libxml-2.0) -lm -lexiv2
+OFLAGS_GTK = $(OFLAGS) -Wl,--as-needed $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 prefix   = /usr/local
 bindir   = $(prefix)/bin
 datadir  = $(prefix)/share
@@ -18,10 +19,10 @@
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
 gpscorrelate: $(COBJS)
-	g++ $(OFLAGS) -o $@ $(COBJS)
+	g++ -o $@ $(COBJS) $(OFLAGS_CON)
 
 gpscorrelate-gui: $(GOBJS)
-	g++ $(OFLAGS) -o $@ $(GOBJS)
+	g++ -o $@ $(GOBJS) $(OFLAGS_GTK)
 
 .c.o:
 	gcc $(CFLAGS) -c -o $*.o $<
@@ -30,7 +31,7 @@
 	g++ $(CFLAGS) -c -o $*.o $<
 
 clean:
-	rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
+	rm -f *.o gpscorrelate gpscorrelate-gui doc/gpscorrelate-manpage.xml gpscorrelate.1
 
 install: all
 	install -d $(DESTDIR)$(bindir)
@@ -48,4 +49,4 @@
 	sed  's,@DOCDIR@,$(docdir),' $< > $@
 
 gpscorrelate.1: doc/gpscorrelate-manpage.xml
-	xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	xsltproc --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<