/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: Teddy Hogeborn
  • Date: 2008-08-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
20
20
# MANDIR=/usr/local/man
21
21
MANDIR=/usr/share/man
22
22
 
 
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
25
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
26
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
27
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
28
GPGME_LIBS=$(shell gpgme-config --libs)
 
29
 
23
30
# Do not change these two
24
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
 
31
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
32
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
25
33
LDFLAGS=$(COVERAGE)
26
34
 
27
 
DOCBOOKTOMAN=xsltproc --nonet \
 
35
# Commands to format a DocBook refentry document into a manual page
 
36
DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
28
37
        --param man.charmap.use.subset          0 \
29
38
        --param make.year.ranges                1 \
30
39
        --param make.single.year.ranges         1 \
31
40
        --param man.output.quietly              1 \
32
 
        --param man.authors.section.enabled     0
 
41
        --param man.authors.section.enabled     0 \
 
42
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
43
        $(notdir $<); \
 
44
        $(MANPOST) $(notdir $@)
 
45
# DocBook-to-man post-processing to fix a \n escape bug
 
46
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
33
47
 
34
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
35
49
PROGS=plugin-runner $(PLUGINS)
38
52
        plugins.d/password-prompt.8mandos mandos.conf.5 \
39
53
        mandos-clients.conf.5
40
54
 
41
 
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
 
55
objects=$(addsuffix .o,$(PROGS))
42
56
 
43
57
all: $(PROGS)
44
58
 
45
59
doc: $(DOCS)
46
60
 
47
61
%.5: %.xml
48
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
 
62
        $(DOCBOOKTOMAN)
49
63
 
50
64
%.8: %.xml
51
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
 
65
        $(DOCBOOKTOMAN)
52
66
 
53
67
%.8mandos: %.xml
54
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
55
 
 
56
 
plugin-runner: plugin-runner.o
57
 
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
68
        $(DOCBOOKTOMAN)
 
69
 
 
70
mandos.8: mandos.xml mandos-options.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos.conf.5: mandos.conf.xml mandos-options.xml
 
74
        $(DOCBOOKTOMAN)
58
75
 
59
76
plugins.d/password-request: plugins.d/password-request.o
60
 
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
61
 
                $(LOADLIBES) $(LDLIBS) -o $@
62
 
 
63
 
plugins.d/password-prompt: plugins.d/password-prompt.o
64
 
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
65
 
 
66
 
.PHONY : all clean distclean run-client run-server install \
 
77
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
78
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
79
 
 
80
.PHONY : all doc clean distclean run-client run-server install \
67
81
        install-server install-client uninstall uninstall-server \
68
82
        uninstall-client purge purge-server purge-client
69
83