File: 1030-fix-makefile.diff

package info (click to toggle)
gpstrans 0.41-13
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 916 kB
  • sloc: ansic: 6,200; makefile: 158; xml: 17
file content (49 lines) | stat: -rw-r--r-- 1,639 bytes parent folder | download | duplicates (3)
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
Description: patch to add GCC hardening.
Author: Raphael Mota Ramos <raphaelmota.ti@gmail.com>
Forwarded: no
Last-Update: 2015-12-01
---
Index: gpstrans-0.41/src/gps/Makefile
===================================================================
--- gpstrans-0.41.orig/src/gps/Makefile
+++ gpstrans-0.41/src/gps/Makefile
@@ -17,7 +17,7 @@ OFILES	= sendgpsinfo.o dms.o datum.o cal
 HFILES  = ../include/defs.h ../include/Prefs.h ../include/Garmin.h ../include/protocols.h
 
 .c.o:	$(HFILES)
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $<
 
 all:	$(OFILES) $(HFILES)
 
Index: gpstrans-0.41/src/grid/Makefile
===================================================================
--- gpstrans-0.41.orig/src/grid/Makefile
+++ gpstrans-0.41/src/grid/Makefile
@@ -16,7 +16,7 @@ OFILES	= itm.o bng.o tm.o ups.o utm.o kk
 HFILES  = ../include/defs.h ../include/Garmin.h ../include/Prefs.h
 
 .c.o:	
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $<
 
 all:	$(OFILES) $(HFILES)
 
Index: gpstrans-0.41/src/Makefile
===================================================================
--- gpstrans-0.41.orig/src/Makefile
+++ gpstrans-0.41/src/Makefile
@@ -33,11 +33,11 @@ XFILES	= gps/sendgpsinfo.o gps/dms.o gps
 
 
 .c.o:	$(HFILES)
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $<
 
 all:	$(OFILES) $(HFILES)
 	@echo "Making all in ./getline"
-	@(cd getline ; make libgetline.a)
+	@(cd getline ; make CFLAGS="$(CFLAGS)" libgetline.a)
 	@echo "Making all in ./gps"
 	@(cd gps  ; make all CC="$(CC)" CFLAGS="$(CFLAGS)")
 	@echo "Making all in ./grid"