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
|
Author: Gert Wollny <gw.fossdev@gmail.com>
Description: Add hardening flags to build
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,13 @@
X11LIBS = -lX11 -lm -lpthread
SRCDIR = ./
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+LDFLAGS2 = -Wl,--as-needed -Wl,-z,now -pie -fPIE
+
#######
####### Declarations for Qt3
QT3DIR = /usr/lib/qt-3.3
@@ -39,10 +46,10 @@
#######
####### Declarations for Qt4
-QT4DIR = /usr/lib/qt4
-QT4MOC = /usr/lib/qt4/bin/moc-qt4
+QT4DIR = /usr/share/qt4
+QT4MOC = /usr/share/qt4/bin/moc
MOC4FLAGS = "MOCFLAGS=-DQT_VERSION=0x040000"
-QT4CFLAGS = "-I/usr/include/Qt -pipe -O2"
+CXXFLAGS += -I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -g -O2 -fPIE -pie
QT4H = QT_Spec.h
QT4LIBS = "-L$(QT4DIR)/lib -L/usr/X11R6/lib -lQtCore -lQtGui"
#
@@ -68,16 +75,16 @@
make exprlp
Qt4:
- make rlplot QTDIR=$(QT4DIR) MOC=$(QT4MOC) CFLAGS=$(QT4CFLAGS) QTH=$(QT4H) $(MOC4FLAGS) LIBS=$(QT4LIBS)
+ make rlplot QTDIR=$(QT4DIR) MOC=$(QT4MOC) QTH=$(QT4H) $(MOC4FLAGS) LIBS=$(QT4LIBS)
Qt3:
make rlplot QTDIR=$(QT3DIR) MOC=$(QT3MOC) CFLAGS=$(QT3CFLAGS) QTH=$(QT3H) $(MOC3FLAGS) LIBS=$(QT3LIBS)
rlplot: $(OBJECTS)
- $(CC) -o rlplot $(OBJECTS) $(LIBS) $(QTLIBS) $(X11LIBS)
+ $(CC) -o rlplot $(OBJECTS) $(LIBS) $(QTLIBS) $(X11LIBS) $(LDFLAGS) $(LDFLAGS2)
exprlp: $(GENOBJ)
- $(CC) -o exprlp $(GENOBJ)
+ $(CC) -o exprlp $(GENOBJ) $(LDFLAGS) $(LDFLAGS2)
clean:
rm -f *.o *~
@@ -88,68 +95,68 @@
####### Compile
moc_QT_Spec.o: moc_QT_Spec.cpp $(SRCDIR)QT_Spec.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
moc_QT_Spec.cpp: $(SRCDIR)QT_Spec.h
$(MOC) $(SRCDIR)$(QTH) -o moc_QT_Spec.cpp $(MOCFLAGS)
mfcalc.o: $(SRCDIR)mfcalc.cpp
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
rlp_math.o: $(SRCDIR)rlp_math.cpp
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
#$(SRCDIR)mfcalc.cpp: $(SRCDIR)mfcalc.y
# bison -l -o $@ $<
exprlp.o: $(SRCDIR)exprlp.cpp
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
QT_Spec.o: $(SRCDIR)QT_Spec.cpp $(SRCDIR)QT_Spec.h $(SRCDIR)rlplot.h $(SRCDIR)menu.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
Output.o: $(SRCDIR)Output.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
Utils.o: $(SRCDIR)Utils.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
UtilObj.o: $(SRCDIR)UtilObj.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
TheDialog.o: $(SRCDIR)TheDialog.cpp $(SRCDIR)TheDialog.h $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
rlplot.o: $(SRCDIR)rlplot.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
Fileio.o: $(SRCDIR)Fileio.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
PropertyDlg.o: $(SRCDIR)PropertyDlg.cpp $(SRCDIR)rlplot.h $(SRCDIR)TheDialog.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
spreadwi.o: $(SRCDIR)spreadwi.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
Export.o: $(SRCDIR)Export.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
PlotObs.o: $(SRCDIR)PlotObs.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
ODbuttons.o: $(SRCDIR)ODbuttons.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
Axes.o: $(SRCDIR)Axes.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
no_gui.o: $(SRCDIR)no_gui.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
use_gui.o: $(SRCDIR)use_gui.cpp $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
reports.o: $(SRCDIR)reports.cpp $(SRCDIR)TheDialog.h $(SRCDIR)rlplot.h
- $(CC) $(CFLAGS) -o $@ -c $<
+ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
|
