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
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
Author: Andreas Beckmann <anbe@debian.org>
Description: do not lose hardening flags
--- a/configure.in
+++ b/configure.in
@@ -55,12 +55,12 @@ if test "$GCC" = yes; then
SUN4FLAGS="-Wno-implicit -Wno-char-subscripts -D__EXTENSIONS__"
CFLAGS="-O -Wall $SUN4FLAGS"
else
- CFLAGS="-O -Wall"
+ #CFLAGS="-O -Wall"
CFLAGSG="-O -g -Wall"
fi
else
DEPEND_PROG="cc -M"
- CFLAGS="-O"
+ #CFLAGS="-O"
fi
if test -x /usr/ucb/install; then
INSTALL="/usr/ucb/install"
--- a/src/bin/Makefile.in
+++ b/src/bin/Makefile.in
@@ -32,41 +32,41 @@ all: $(TARGETS:.exe=)
kic: kicmain.o global.o $(RESOURCE) ../kic.a ../cd.a ../convert.a ../help.a \
../ginterf.a $(MFB)
- $(CC) -o kic kicmain.o global.o $(RESOURCE) \
+ $(CC) $(LDFLAGS) -o kic kicmain.o global.o $(RESOURCE) \
../kic.a ../cd.a ../convert.a ../help.a ../ginterf.a \
$(MFB) $(LIBS)
kichelp: helpmain.o global.o ../help.a $(MFB) ../cd.a
- $(CC) $(CC_OPT) -o kichelp helpmain.o global.o ../help.a $(MFB) \
+ $(CC) $(LDFLAGS) $(CC_OPT) -o kichelp helpmain.o global.o ../help.a $(MFB) \
../cd.a $(LIBS)
cif: ciftokic kictocif
kictocif: kictocif.o global.o ../kic.a ../cd.a
- $(CC) -o kictocif kictocif.o global.o ../kic.a ../cd.a -lm
+ $(CC) $(LDFLAGS) -o kictocif kictocif.o global.o ../kic.a ../cd.a -lm
ciftokic: ciftokic.o global.o ../cd.a
- $(CC) -o ciftokic ciftokic.o global.o ../cd.a -lm
+ $(CC) $(LDFLAGS) -o ciftokic ciftokic.o global.o ../cd.a -lm
stream: kictostr strtokic strmtext
kictostr: kictostr.o global.o ../kic.a ../cd.a
- $(CC) -o kictostr kictostr.o global.o ../kic.a ../cd.a -lm
+ $(CC) $(LDFLAGS) -o kictostr kictostr.o global.o ../kic.a ../cd.a -lm
strtokic: strtokic.o global.o ../cd.a
- $(CC) -o strtokic strtokic.o global.o ../cd.a -lm
+ $(CC) $(LDFLAGS) -o strtokic strtokic.o global.o ../cd.a -lm
strmtext: strmtext.o
- $(CC) -o strmtext strmtext.o -lm
+ $(CC) $(LDFLAGS) -o strmtext strmtext.o -lm
kicscale: kicscale.o global.o ../kic.a ../cd.a
- $(CC) -o kicscale kicscale.o global.o ../kic.a ../cd.a -lm
+ $(CC) $(LDFLAGS) -o kicscale kicscale.o global.o ../kic.a ../cd.a -lm
####### Object file targets ###########################################
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
global.o:
- $(CC) $(CFLAGS) -DKIC_LIB_DIR=\"$(KIC_LIB_DIR)\" \
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DKIC_LIB_DIR=\"$(KIC_LIB_DIR)\" \
-DVERSION_STR="\"$(VERSION)\"" $(INCLUDE) -c $*.c
kicrc.o: kic.rc
@@ -129,7 +129,7 @@ distclean::
####### Install #######################################################
-INSTALL_BIN = $(INSTALL) -sc -m 0755 $(INSTALL_USER)
+INSTALL_BIN = $(INSTALL) -c -m 0755 $(INSTALL_USER)
INSTALL_LIB = $(INSTALL) -c -m 0644 $(INSTALL_USER)
install: $(TARGETS) $(KIC_EXEC_DIR) $(KIC_LIB_DIR)
--- a/src/cd/Makefile.in
+++ b/src/cd/Makefile.in
@@ -43,7 +43,7 @@ ci:
done
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
depend:
@echo depending in src/cd
--- a/src/convert/Makefile.in
+++ b/src/convert/Makefile.in
@@ -43,7 +43,7 @@ ci:
done
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
depend:
@echo depending in src/convert
--- a/src/ginterf/Makefile.in
+++ b/src/ginterf/Makefile.in
@@ -43,7 +43,7 @@ ci:
done
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
depend:
@echo depending in src/ginterf
--- a/src/help/Makefile.in
+++ b/src/help/Makefile.in
@@ -43,7 +43,7 @@ ci:
done
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
depend:
@echo depending in src/help
--- a/src/kic/Makefile.in
+++ b/src/kic/Makefile.in
@@ -47,7 +47,7 @@ ci:
done
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
depend:
@echo depending in src/kic
--- a/src/xmfb/Makefile.in
+++ b/src/xmfb/Makefile.in
@@ -45,7 +45,7 @@ ci:
done
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $*.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -c $*.c
depend:
@echo depending in src/xmfb
|
