/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: 2012-05-07 20:46:51 UTC
  • Revision ID: teddy@recompile.se-20120507204651-qx5o5ztwmau54mh4
* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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 \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
8
 
        -Wunreachable-code
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code
9
9
#DEBUG=-ggdb3
10
 
# 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>
11
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
12
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
14
LINK_FORTIFY_LD=-z relro -z now
22
23
OPTIMIZE=-Os
23
24
LANGUAGE=-std=gnu99
24
25
htmldir=man
25
 
version=1.6.4
 
26
version=1.5.3
26
27
SED=sed
27
28
 
28
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
35
36
# MANDIR=$(PREFIX)/man
36
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
37
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
38
 
# LIBDIR=$(PREFIX)/lib
39
39
##
40
40
 
41
41
## These settings are for a package-type install
45
45
MANDIR=$(PREFIX)/share/man
46
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
47
STATEDIR=$(DESTDIR)/var/lib/mandos
48
 
LIBDIR=$(shell \
49
 
        for d in \
50
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
51
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
52
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
53
 
                        echo "$(DESTDIR)$$d"; \
54
 
                        break; \
55
 
                fi; \
56
 
        done)
57
48
##
58
49
 
59
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
60
 
 
61
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
62
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
63
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
67
56
        getconf LFS_LDFLAGS)
68
57
 
69
58
# Do not change these two
70
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
71
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
72
61
        -DVERSION='"$(version)"'
73
 
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))
74
63
 
75
64
# Commands to format a DocBook <refentry> document into a manual page
76
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
79
68
        --param make.single.year.ranges         1 \
80
69
        --param man.output.quietly              1 \
81
70
        --param man.authors.section.enabled     0 \
82
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
83
72
        $(notdir $<); \
84
73
        $(MANPOST) $(notdir $@);\
85
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
86
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
87
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
88
 
        fi >/dev/null)
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
89
76
# DocBook-to-man post-processing to fix a '\n' escape bug
90
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
91
78
 
238
225
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
239
226
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
240
227
 
241
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
242
 
        check run-client run-server install install-html \
243
 
        install-server install-client-nokey install-client uninstall \
244
 
        uninstall-server uninstall-client purge purge-server \
245
 
        purge-client
 
228
.PHONY : all doc html clean distclean run-client run-server install \
 
229
        install-server install-client uninstall uninstall-server \
 
230
        uninstall-client purge purge-server purge-client
246
231
 
247
232
clean:
248
233
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
254
239
 
255
240
check:  all
256
241
        ./mandos --check
257
 
        ./mandos-ctl --check
258
242
 
259
243
# Run the client with a local config and key
260
244
run-client: all keydir/seckey.txt keydir/pubkey.txt
305
289
 
306
290
install-server: doc
307
291
        install --directory $(CONFDIR)
308
 
        if install --directory --mode=u=rwx --owner=$(USER) \
309
 
                --group=$(GROUP) $(STATEDIR); then \
310
 
                :; \
311
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
312
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
313
 
        fi
 
292
        install --directory --mode=u=rwx --owner=$(USER) \
 
293
                --group=$(GROUP) $(STATEDIR)
314
294
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
315
295
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
316
296
                mandos-ctl
324
304
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
325
305
        install --mode=u=rwx,go=rx init.d-mandos \
326
306
                $(DESTDIR)/etc/init.d/mandos
327
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
328
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
329
 
        fi
330
307
        install --mode=u=rw,go=r default-mandos \
331
308
                $(DESTDIR)/etc/default/mandos
332
309
        if [ -z $(DESTDIR) ]; then \
346
323
                > $(MANDIR)/man8/intro.8mandos.gz
347
324
 
348
325
install-client-nokey: all doc
349
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
326
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
350
327
        install --directory --mode=u=rwx $(KEYDIR) \
351
 
                $(LIBDIR)/mandos/plugins.d
352
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
328
                $(PREFIX)/lib/mandos/plugins.d
 
329
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
353
330
                install --mode=u=rwx \
354
331
                        --directory "$(CONFDIR)/plugins.d"; \
355
332
        fi
356
333
        install --mode=u=rwx,go=rx --directory \
357
334
                "$(CONFDIR)/network-hooks.d"
358
335
        install --mode=u=rwx,go=rx \
359
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
336
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
360
337
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
361
338
                mandos-keygen
362
339
        install --mode=u=rwx,go=rx \
363
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
340
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
364
341
                plugins.d/password-prompt
365
342
        install --mode=u=rwxs,go=rx \
366
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
343
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
367
344
                plugins.d/mandos-client
368
345
        install --mode=u=rwxs,go=rx \
369
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
346
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
370
347
                plugins.d/usplash
371
348
        install --mode=u=rwxs,go=rx \
372
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
349
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
373
350
                plugins.d/splashy
374
351
        install --mode=u=rwxs,go=rx \
375
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
352
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
376
353
                plugins.d/askpass-fifo
377
354
        install --mode=u=rwxs,go=rx \
378
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
379
356
                plugins.d/plymouth
380
357
        install initramfs-tools-hook \
381
358
                $(INITRAMFSTOOLS)/hooks/mandos
427
404
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
428
405
                $(DESTDIR)/etc/crypttab
429
406
        -rm --force $(PREFIX)/sbin/mandos-keygen \
430
 
                $(LIBDIR)/mandos/plugin-runner \
431
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
432
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
433
 
                $(LIBDIR)/mandos/plugins.d/usplash \
434
 
                $(LIBDIR)/mandos/plugins.d/splashy \
435
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
436
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
407
                $(PREFIX)/lib/mandos/plugin-runner \
 
408
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
409
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
410
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
411
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
412
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
413
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
437
414
                $(INITRAMFSTOOLS)/hooks/mandos \
438
415
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
439
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
445
422
                $(MANDIR)/man8/splashy.8mandos.gz \
446
423
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
447
424
                $(MANDIR)/man8/plymouth.8mandos.gz \
448
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
449
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
425
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
426
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
450
427
        update-initramfs -k all -u
451
428
 
452
429
purge: purge-server purge-client
456
433
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
457
434
                $(DESTDIR)/etc/default/mandos \
458
435
                $(DESTDIR)/etc/init.d/mandos \
459
 
                $(SYSTEMD)/mandos.service \
460
 
                $(DESTDIR)/run/mandos.pid \
461
436
                $(DESTDIR)/var/run/mandos.pid
462
437
        -rmdir $(CONFDIR)
463
438