/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: 2013-06-23 15:13:06 UTC
  • Revision ID: teddy@recompile.se-20130623151306-3y4zwy76d95hcvpq
* mandos: Bug fix: Make boolean options work from the config file
          again.
          Bug fix: Make --no-ipv6 work again.
          Bug fix: Add extra magic to GnuTLS priority to make it work
          with current version of GnuTLS.
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -
* plugins.d/mandos-client.xml (EXAMPLE): Minor grammar fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
 
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
 
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
 
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
 
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
8
 
        -Wconversion -Wlogical-op -Waggregate-return \
9
 
        -Wstrict-prototypes -Wold-style-definition \
10
 
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
 
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
 
        -Wvolatile-register-var -Woverlength-strings
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code
13
9
#DEBUG=-ggdb3
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
15
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
14
LINK_FORTIFY_LD=-z relro -z now
23
20
LINK_FORTIFY += -pie
24
21
endif
25
22
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
 
23
OPTIMIZE=-Os
27
24
LANGUAGE=-std=gnu99
28
25
htmldir=man
29
 
version=1.6.5
 
26
version=1.6.0
30
27
SED=sed
31
28
 
32
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
39
36
# MANDIR=$(PREFIX)/man
40
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
41
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
42
 
# LIBDIR=$(PREFIX)/lib
43
39
##
44
40
 
45
41
## These settings are for a package-type install
49
45
MANDIR=$(PREFIX)/share/man
50
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
51
47
STATEDIR=$(DESTDIR)/var/lib/mandos
52
 
LIBDIR=$(shell \
53
 
        for d in \
54
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
55
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
56
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
57
 
                        echo "$(DESTDIR)$$d"; \
58
 
                        break; \
59
 
                fi; \
60
 
        done)
61
48
##
62
49
 
63
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
64
 
 
65
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
67
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
71
56
        getconf LFS_LDFLAGS)
72
57
 
73
58
# Do not change these two
74
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
75
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
76
61
        -DVERSION='"$(version)"'
77
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
78
63
 
79
64
# Commands to format a DocBook <refentry> document into a manual page
80
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
85
70
        --param man.authors.section.enabled     0 \
86
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
87
72
        $(notdir $<); \
 
73
        $(MANPOST) $(notdir $@);\
88
74
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
89
75
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
90
76
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
91
77
        fi >/dev/null)
 
78
# DocBook-to-man post-processing to fix a '\n' escape bug
 
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
80
 
93
81
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
94
82
        --param make.year.ranges                1 \
239
227
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
240
228
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
241
229
 
242
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
 
        check run-client run-server install install-html \
244
 
        install-server install-client-nokey install-client uninstall \
245
 
        uninstall-server uninstall-client purge purge-server \
246
 
        purge-client
 
230
.PHONY : all doc html clean distclean run-client run-server install \
 
231
        install-server install-client uninstall uninstall-server \
 
232
        uninstall-client purge purge-server purge-client
247
233
 
248
234
clean:
249
235
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
306
292
 
307
293
install-server: doc
308
294
        install --directory $(CONFDIR)
309
 
        if install --directory --mode=u=rwx --owner=$(USER) \
310
 
                --group=$(GROUP) $(STATEDIR); then \
311
 
                :; \
312
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
313
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
314
 
        fi
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
315
297
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
316
298
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
317
299
                mandos-ctl
325
307
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
326
308
        install --mode=u=rwx,go=rx init.d-mandos \
327
309
                $(DESTDIR)/etc/init.d/mandos
328
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
329
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
330
 
        fi
331
310
        install --mode=u=rw,go=r default-mandos \
332
311
                $(DESTDIR)/etc/default/mandos
333
312
        if [ -z $(DESTDIR) ]; then \
347
326
                > $(MANDIR)/man8/intro.8mandos.gz
348
327
 
349
328
install-client-nokey: all doc
350
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
351
330
        install --directory --mode=u=rwx $(KEYDIR) \
352
 
                $(LIBDIR)/mandos/plugins.d
353
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
331
                $(PREFIX)/lib/mandos/plugins.d
 
332
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
354
333
                install --mode=u=rwx \
355
334
                        --directory "$(CONFDIR)/plugins.d"; \
356
335
        fi
357
336
        install --mode=u=rwx,go=rx --directory \
358
337
                "$(CONFDIR)/network-hooks.d"
359
338
        install --mode=u=rwx,go=rx \
360
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
361
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
362
341
                mandos-keygen
363
342
        install --mode=u=rwx,go=rx \
364
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
343
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
365
344
                plugins.d/password-prompt
366
345
        install --mode=u=rwxs,go=rx \
367
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
346
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
368
347
                plugins.d/mandos-client
369
348
        install --mode=u=rwxs,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
349
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
350
                plugins.d/usplash
372
351
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
352
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
374
353
                plugins.d/splashy
375
354
        install --mode=u=rwxs,go=rx \
376
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
377
356
                plugins.d/askpass-fifo
378
357
        install --mode=u=rwxs,go=rx \
379
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
358
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
380
359
                plugins.d/plymouth
381
360
        install initramfs-tools-hook \
382
361
                $(INITRAMFSTOOLS)/hooks/mandos
428
407
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
429
408
                $(DESTDIR)/etc/crypttab
430
409
        -rm --force $(PREFIX)/sbin/mandos-keygen \
431
 
                $(LIBDIR)/mandos/plugin-runner \
432
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
433
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
434
 
                $(LIBDIR)/mandos/plugins.d/usplash \
435
 
                $(LIBDIR)/mandos/plugins.d/splashy \
436
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
437
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
410
                $(PREFIX)/lib/mandos/plugin-runner \
 
411
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
412
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
413
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
414
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
415
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
416
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
438
417
                $(INITRAMFSTOOLS)/hooks/mandos \
439
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
440
419
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
446
425
                $(MANDIR)/man8/splashy.8mandos.gz \
447
426
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
448
427
                $(MANDIR)/man8/plymouth.8mandos.gz \
449
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
450
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
428
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
429
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
451
430
        update-initramfs -k all -u
452
431
 
453
432
purge: purge-server purge-client
457
436
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
458
437
                $(DESTDIR)/etc/default/mandos \
459
438
                $(DESTDIR)/etc/init.d/mandos \
460
 
                $(SYSTEMD)/mandos.service \
461
 
                $(DESTDIR)/run/mandos.pid \
462
439
                $(DESTDIR)/var/run/mandos.pid
463
440
        -rmdir $(CONFDIR)
464
441