/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: Mooie
  • Date: 2009-01-10 00:53:09 UTC
  • mto: (237.2.21 mandos)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: mooie@thinkmoo-20090110005309-1f1uhhvrif4tg6ev
Updated Makefile to use -fPIC.
Updated Makefile to use -pie and -fPIE correctly.

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
45
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
48
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
 
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 \
175
176
        $(SED) --in-place \
176
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
177
178
                $@
 
179
        $(SED) --in-place \
 
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
181
                $@
178
182
 
179
183
plugins.d/mandos-client: plugins.d/mandos-client.o
180
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \