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
|
From: Yukiharu YABUKI <yyabuki@debian.org>
Date: Sun, 14 Sep 2025 13:34:40 -0700
Subject: hardening
===================================================================
---
Makefile | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 7595c36..2af5081 100644
--- a/Makefile
+++ b/Makefile
@@ -21,53 +21,58 @@ CHMOD = chmod
XFIREWORKS_CONF_DIRECTRY = $(LIBDIR)
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
OBJS = main.o AfterImage.o Disp.o ColorGC.o Obj.o Stream.o Piece.o XFireworks.o Calculator.o etc.o arguments.o
all : xfireworks manual
xfireworks : $(OBJS)
- $(CC) -o xfireworks $(OBJS) -L$(XLIBDIR) $(CFLAGS) $(LFLAGS)
+ $(CC) -o xfireworks $(OBJS) -L$(XLIBDIR) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LFLAGS)
main.o : main.c
- $(CC) -c main.c $(CFLAGS) \
+ $(CC) -c main.c $(CPPFLAGS) $(CFLAGS) \
-DVERSION=\"$(VERSION)\" \
-DXFIREWORKS_CONF_DIRECTRY=\"$(XFIREWORKS_CONF_DIRECTRY)\"
AfterImage.o : AfterImage.c
- $(CC) -c AfterImage.c -I$(XINCLUDEDIR) $(CFLAGS)
+ $(CC) -c AfterImage.c -I$(XINCLUDEDIR) $(CPPFLAGS) $(CFLAGS)
Disp.o : Disp.c
- $(CC) -c Disp.c -I$(XINCLUDEDIR) $(CFLAGS)
+ $(CC) -c Disp.c -I$(XINCLUDEDIR) $(CPPFLAGS) $(CFLAGS)
ColorGC.o : ColorGC.c
- $(CC) -c ColorGC.c -I$(XINCLUDEDIR) $(CFLAGS)
+ $(CC) -c ColorGC.c -I$(XINCLUDEDIR) $(CPPFLAGS) $(CFLAGS)
Obj.o : Obj.c
- $(CC) -c Obj.c $(CFLAGS)
+ $(CC) -c Obj.c $(CPPFLAGS) $(CFLAGS)
Stream.o : Stream.c
- $(CC) -c Stream.c $(CFLAGS)
+ $(CC) -c Stream.c $(CPPFLAGS) $(CFLAGS)
Calculator.o : Calculator.c
- $(CC) -c Calculator.c $(CFLAGS)
+ $(CC) -c Calculator.c $(CPPFLAG) $(CFLAGS)
Piece.o : Piece.c
- $(CC) -c Piece.c -I$(XINCLUDEDIR) $(CFLAGS)
+ $(CC) -c Piece.c -I$(XINCLUDEDIR) $(CPPFLAGS) $(CFLAGS)
XFireworks.o : XFireworks.c xfireworks_conf.h
- $(CC) -c XFireworks.c -I$(XINCLUDEDIR) $(CFLAGS)
+ $(CC) -c XFireworks.c -I$(XINCLUDEDIR) $(CPPFLAGS) $(CFLAGS)
xfireworks_conf.h : xfireworks.conf mkconf
cat xfireworks.conf | ./mkconf > xfireworks_conf.h
mkconf : mkconf.c
- $(CC) mkconf.c -o mkconf
+ $(CC) $(CPPFLAGS) $(CFLAGS) mkconf.c -o mkconf
etc.o : etc.c
- $(CC) -c etc.c $(CFLAGS)
+ $(CC) -c etc.c $(CPPFLAGS) $(CFLAGS)
arguments.o : arguments.c
- $(CC) -c arguments.c $(CFLAGS)
+ $(CC) -c arguments.c $(CPPFLAGS) $(CFLAGS)
manual : xfireworks.6.gz
|
