/mandos/release

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

« 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
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
13
14
#COVERAGE=--coverage
14
15
OPTIMIZE=-Os
15
16
LANGUAGE=-std=gnu99
44
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
45
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
46
47
        -DVERSION='"$(version)"'
47
 
LDFLAGS=$(COVERAGE)
 
48
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
48
49
 
49
50
# Commands to format a DocBook <refentry> document into a manual page
50
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
78
79
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
79
80
        plugins.d/mandos-client.8mandos \
80
81
        plugins.d/password-prompt.8mandos mandos.conf.5 \
81
 
        mandos-clients.conf.5
 
82
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
83
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
82
84
 
83
85
htmldocs=$(addsuffix .xhtml,$(DOCS))
84
86
 
149
151
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
150
152
 
151
153
mandos: Makefile
152
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"/\1$(version)"/' $@
 
154
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
153
155
 
154
156
mandos-keygen: Makefile
155
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"/\1$(version)"/' $@
 
157
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
156
158
 
157
159
plugins.d/mandos-client: plugins.d/mandos-client.o
158
160
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
268
270
                > $(MANDIR)/man8/password-prompt.8mandos.gz
269
271
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
270
272
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
273
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
274
                > $(MANDIR)/man8/usplash.8mandos.gz
 
275
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
276
                > $(MANDIR)/man8/splashy.8mandos.gz
 
277
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
278
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
271
279
 
272
280
install-client: install-client-nokey
273
281
# Post-installation stuff
296
304
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
297
305
                $(PREFIX)/lib/mandos/plugins.d/usplash \
298
306
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
307
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
299
308
                $(INITRAMFSTOOLS)/hooks/mandos \
300
309
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
301
310
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
302
311
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
303
312
                $(MANDIR)/man8/mandos-keygen.8.gz \
304
313
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
314
                $(MANDIR)/man8/usplash.8mandos.gz \
 
315
                $(MANDIR)/man8/splashy.8mandos.gz \
 
316
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
305
317
                $(MANDIR)/man8/mandos-client.8mandos.gz
306
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
307
 
                rm --force $(CONFDIR)/plugins.d/README; \
308
 
        fi
309
318
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
310
319
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
311
320
        update-initramfs -k all -u