-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathgpsbabel-0009-Remove-SHAPE-ZLIB-MINIZIP-from-LIBOBJS.patch
38 lines (31 loc) · 1.47 KB
/
gpsbabel-0009-Remove-SHAPE-ZLIB-MINIZIP-from-LIBOBJS.patch
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
From 175b500a34988c022da20abc8ed15dbc46046638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <[email protected]>
Date: Wed, 5 Sep 2018 07:08:50 +0200
Subject: [PATCH 9/9] Remove $(SHAPE) @ZLIB@ $(MINIZIP) from LIBOBJS.
---
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c27bac99..df338b2a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,7 @@ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
src/core/xmlstreamwriter.o \
src/core/usasciicodec.o\
src/core/ziparchive.o \
- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(MINIZIP) $(FMTS) $(FILTERS)
+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS)
OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
DEPFILES = $(OBJS:.o=.d)
@@ -143,10 +143,10 @@ toolinfo
all: gpsbabel$(EXEEXT)
gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(SHAPE) @ZLIB@ $(MINIZIP) $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
gpsbabel-debug: $(OBJS)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(SHAPE) @ZLIB@ $(MINIZIP) @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
gbversion.h.in gui/setup.iss.in
--
2.17.1