/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-10-04 20:19:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081004201958-a7iql0rss7yf6leu
* Makefile (FORTIFY): Added "-fPIE -pie".
  (LINK_FORTIFY): New; set to "-z relro -pie".
  (LDFLAGS): Use $(LINK_FORTIFY).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
15
14
#COVERAGE=--coverage
16
15
OPTIMIZE=-Os
17
16
LANGUAGE=-std=gnu99
18
17
htmldir=man
19
 
version=1.0.4
 
18
version=1.0
20
19
SED=sed
21
20
 
22
21
## Use these settings for a traditional /usr/local install
46
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
47
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
50
49
 
51
50
# Commands to format a DocBook <refentry> document into a manual page
52
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
71
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
71
        $<; $(HTMLPOST) $@
73
72
# Fix citerefentry links
74
 
HTMLPOST=$(SED) --in-place \
75
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
73
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
76
74
 
77
75
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
76
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
77
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
78
PROGS=mandos mandos-keygen $(CPROGS)
81
79
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
80
        plugins.d/mandos-client.8mandos \
83
81
        plugins.d/password-prompt.8mandos mandos.conf.5 \
88
86
 
89
87
objects=$(addsuffix .o,$(CPROGS))
90
88
 
91
 
all: $(PROGS) mandos.lsm
 
89
all: $(PROGS)
92
90
 
93
91
doc: $(DOCS)
94
92
 
150
148
 
151
149
# Update all these files with version number $(version)
152
150
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
 
151
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
156
152
 
157
153
mandos: Makefile
158
 
        $(SED) --in-place \
159
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
 
154
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
161
155
 
162
156
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
164
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
166
 
 
167
 
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
171
 
 
172
 
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
174
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
177
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
180
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
 
157
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
182
158
 
183
159
plugins.d/mandos-client: plugins.d/mandos-client.o
184
160
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
203
179
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
180
        ./plugin-runner --plugin-dir=plugins.d \
205
181
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
182
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
208
183
 
209
184
# Used by run-client
210
185
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
213
188
 
214
189
# Run the server with a local config
215
190
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
191
        ./mandos --debug --configdir=confdir
217
192
 
218
193
# Used by run-server
219
194
confdir/mandos.conf: mandos.conf
227
202
 
228
203
install: install-server install-client-nokey
229
204
 
230
 
install-html: html
 
205
install-html: $(htmldocs)
231
206
        install --directory $(htmldir)
232
207
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
233
208
                $(htmldocs)