/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-12-28 10:20:47 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081228102047-1fhyj7oqxfdo44d2
* Makefile: Bug fix for Debian bug #509398; make sure "-z relro" is
            passed to linker, not C compiler.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
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
22
14
#COVERAGE=--coverage
23
15
OPTIMIZE=-Os
24
16
LANGUAGE=-std=gnu99
25
17
htmldir=man
26
 
version=1.0.14
 
18
version=1.0.2
27
19
SED=sed
28
20
 
29
21
## Use these settings for a traditional /usr/local install
42
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
35
##
44
36
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
52
43
 
53
44
# Do not change these two
54
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
47
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
58
49
 
59
50
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
52
        --param man.charmap.use.subset          0 \
62
53
        --param make.year.ranges                1 \
63
54
        --param make.single.year.ranges         1 \
65
56
        --param man.authors.section.enabled     0 \
66
57
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
58
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
59
        $(MANPOST) $(notdir $@)
69
60
# DocBook-to-man post-processing to fix a '\n' escape bug
70
61
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
62
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
64
        --param make.year.ranges                1 \
74
65
        --param make.single.year.ranges         1 \
75
66
        --param man.output.quietly              1 \
77
68
        --param citerefentry.link               1 \
78
69
        --output $@ \
79
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
71
        $<; $(HTMLPOST) $@
81
72
# Fix citerefentry links
82
73
HTMLPOST=$(SED) --in-place \
83
74
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
85
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
87
78
CPROGS=plugin-runner $(PLUGINS)
88
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
89
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
90
81
        plugins.d/mandos-client.8mandos \
91
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
158
149
 
159
150
# Update all these files with version number $(version)
160
151
common.ent: Makefile
161
 
        $(strip $(SED) --in-place \
162
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
163
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
164
155
 
165
156
mandos: Makefile
166
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
167
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
168
 
                $@)
 
159
                $@
169
160
 
170
161
mandos-keygen: Makefile
171
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
172
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
173
 
                $@)
 
164
                $@
174
165
 
175
 
mandos-ctl: Makefile
176
 
        $(strip $(SED) --in-place \
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
177
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
178
 
                $@)
 
169
                $@
179
170
 
180
171
mandos.lsm: Makefile
181
 
        $(strip $(SED) --in-place \
 
172
        $(SED) --in-place \
182
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
183
 
                $@)
184
 
        $(strip $(SED) --in-place \
 
174
                $@
 
175
        $(SED) --in-place \
185
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
186
 
                $@)
187
 
        $(strip $(SED) --in-place \
188
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
189
 
                $@)
 
177
                $@
190
178
 
191
 
plugins.d/mandos-client: plugins.d/mandos-client.c
192
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
193
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
179
plugins.d/mandos-client: plugins.d/mandos-client.o
 
180
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
181
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
194
182
 
195
183
.PHONY : all doc html clean distclean run-client run-server install \
196
184
        install-server install-client uninstall uninstall-server \
211
199
run-client: all keydir/seckey.txt keydir/pubkey.txt
212
200
        ./plugin-runner --plugin-dir=plugins.d \
213
201
                --config-file=plugin-runner.conf \
214
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
215
 
                $(CLIENTARGS)
 
202
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
216
203
 
217
204
# Used by run-client
218
205
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
221
208
 
222
209
# Run the server with a local config
223
210
run-server: confdir/mandos.conf confdir/clients.conf
224
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
211
        ./mandos --debug --configdir=confdir
225
212
 
226
213
# Used by run-server
227
214
confdir/mandos.conf: mandos.conf
293
280
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
294
281
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
295
282
        install initramfs-tools-script \
296
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
283
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
297
284
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
298
285
        gzip --best --to-stdout mandos-keygen.8 \
299
286
                > $(MANDIR)/man8/mandos-keygen.8.gz
340
327
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
341
328
                $(INITRAMFSTOOLS)/hooks/mandos \
342
329
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
343
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
330
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
344
331
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
345
332
                $(MANDIR)/man8/mandos-keygen.8.gz \
346
333
                $(MANDIR)/man8/password-prompt.8mandos.gz \