/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

Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -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://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
 
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
ifndef BROKEN_PIE
 
17
FORTIFY += -fPIE
 
18
LINK_FORTIFY_LD += -fPIE
 
19
LINK_FORTIFY += -pie
 
20
endif
15
21
#COVERAGE=--coverage
16
22
OPTIMIZE=-Os
17
23
LANGUAGE=-std=gnu99
18
24
htmldir=man
19
 
version=1.0.3
 
25
version=1.0.14
20
26
SED=sed
21
27
 
22
28
## Use these settings for a traditional /usr/local install
35
41
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
42
##
37
43
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
44
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
45
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
46
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
47
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
48
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
49
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
50
        getconf LFS_LDFLAGS)
44
51
 
45
52
# Do not change these two
46
53
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
77
84
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
85
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
86
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
87
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
88
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
89
        plugins.d/mandos-client.8mandos \
83
90
        plugins.d/password-prompt.8mandos mandos.conf.5 \
151
158
# Update all these files with version number $(version)
152
159
common.ent: Makefile
153
160
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
161
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
155
162
                $@
156
163
 
157
164
mandos: Makefile
164
171
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
172
                $@
166
173
 
167
 
mandos-list: Makefile
 
174
mandos-ctl: Makefile
168
175
        $(SED) --in-place \
169
176
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
177
                $@
213
220
 
214
221
# Run the server with a local config
215
222
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
223
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
217
224
 
218
225
# Used by run-server
219
226
confdir/mandos.conf: mandos.conf
285
292
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
293
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
294
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
295
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
289
296
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
297
        gzip --best --to-stdout mandos-keygen.8 \
291
298
                > $(MANDIR)/man8/mandos-keygen.8.gz
332
339
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
340
                $(INITRAMFSTOOLS)/hooks/mandos \
334
341
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
342
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
336
343
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
344
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
345
                $(MANDIR)/man8/password-prompt.8mandos.gz \