/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: 2009-01-10 01:14:02 UTC
  • mfrom: (257.1.1 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090110011402-lils5ov6elqmk0sh
Fix compilation error on AMD64, thanks to Frans Pop
<elendil@planet.nl> for the report, thanks to Mooie <mooie@cow.se> for
the fix:

* Makefile (FORTIFY): Replaced "-pie" with "-fPIC".
  (LINK_FORTIFY): Renamed to "LINK_FORTIFY_LD" and added "-fPIE".
  (LINK_FORTIFY): New; set to "-pie".
  (LDFLAGS): Also include "$(LINK_FORTIFY)" (unmodified).

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 -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
14
15
#COVERAGE=--coverage
15
16
OPTIMIZE=-Os
16
17
LANGUAGE=-std=gnu99
17
18
htmldir=man
18
 
version=1.0.2
 
19
version=1.0.3
19
20
SED=sed
20
21
 
21
22
## Use these settings for a traditional /usr/local install
45
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
48
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
50
 
50
51
# Commands to format a DocBook <refentry> document into a manual page
51
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
76
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
79
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
80
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
82
        plugins.d/mandos-client.8mandos \
82
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
163
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
165
                $@
165
166
 
 
167
mandos-list: Makefile
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
 
171
 
166
172
mandos.lsm: Makefile
167
173
        $(SED) --in-place \
168
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
170
176
        $(SED) --in-place \
171
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
172
178
                $@
 
179
        $(SED) --in-place \
 
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
181
                $@
173
182
 
174
183
plugins.d/mandos-client: plugins.d/mandos-client.o
175
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \