/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-08-20 03:22:45 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080820032245-ue341vdvzqdsg68l
* mandos (string_to_delta): Accept a whitespace-separated sequence of
                            intervals and return the sum.  This allows
                            "5m 30s" to be valid.
  (main): Provide an empty default value for the "host" option for
          "clients.conf", making it no longer a required option.

* mandos-clients.conf.xml: Removed <?xml-stylesheet>.
  (DESCRIPTION): Improved text.
  (DEFAULTS): Renamed to "OPTIONS".  Improved text for "timeout" and
              "interval".
  (CLIENTS): Removed; content moved to "OPTIONS".
  (EXPANSION): New section; document %(foo)s and %%(foo)s expansion.
  (FILES): Moved to before "EXAMPLES".
  (BUGS): New section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).  Renamed
              example section "example_client" to "foo".  Changed
              example "host" setting to a more reasonable example host
              name.  Added additional example client "bar".

* mandos-conf.xml: Removed OVERVIEW entity.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
16
# PREFIX=/usr/local
17
 
PREFIX=$(DESTDIR)/usr
 
17
PREFIX=/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=$(DESTDIR)/etc/mandos
 
19
CONFDIR=/etc/mandos
20
20
# MANDIR=/usr/local/man
21
 
MANDIR=$(DESTDIR)/usr/share/man
 
21
MANDIR=/usr/share/man
22
22
 
23
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
33
33
LDFLAGS=$(COVERAGE)
34
34
 
35
35
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
36
DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
37
37
        --param man.charmap.use.subset          0 \
38
38
        --param make.year.ranges                1 \
39
39
        --param make.single.year.ranges         1 \
43
43
        $(notdir $<); \
44
44
        $(MANPOST) $(notdir $@)
45
45
# DocBook-to-man post-processing to fix a \n escape bug
46
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
46
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
47
47
 
48
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
49
49
PROGS=plugin-runner $(PLUGINS)
58
58
 
59
59
doc: $(DOCS)
60
60
 
61
 
%.5: %.xml legalnotice.xml
62
 
        $(DOCBOOKTOMAN)
63
 
 
64
 
%.8: %.xml legalnotice.xml
65
 
        $(DOCBOOKTOMAN)
66
 
 
67
 
%.8mandos: %.xml legalnotice.xml
68
 
        $(DOCBOOKTOMAN)
69
 
 
70
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
71
 
        $(DOCBOOKTOMAN)
72
 
 
73
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
74
 
        $(DOCBOOKTOMAN)
75
 
 
76
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
77
 
        $(DOCBOOKTOMAN)
78
 
 
79
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
80
 
        $(DOCBOOKTOMAN)
81
 
 
82
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
83
 
                                        mandos-options.xml \
84
 
                                        overview.xml legalnotice.xml
 
61
%.5: %.xml
 
62
        $(DOCBOOKTOMAN)
 
63
 
 
64
%.8: %.xml
 
65
        $(DOCBOOKTOMAN)
 
66
 
 
67
%.8mandos: %.xml
 
68
        $(DOCBOOKTOMAN)
 
69
 
 
70
mandos.8: mandos.xml mandos-options.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos.conf.5: mandos.conf.xml mandos-options.xml
85
74
        $(DOCBOOKTOMAN)
86
75
 
87
76
plugins.d/password-request: plugins.d/password-request.o
98
87
distclean: clean
99
88
mostlyclean: clean
100
89
maintainer-clean: clean
101
 
        -rm --force --recursive keydir confdir
 
90
        -rm --force --recursive keydir
102
91
 
103
92
check:
104
93
        ./mandos --check
105
94
 
106
 
# Run the client with a local config and key
107
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
108
 
        keydir/secring.gpg keydir/pubring.gpg
 
95
run-client: all
 
96
        -mkdir keydir
 
97
        -./mandos-keygen --dir keydir
109
98
        ./plugin-runner --plugin-dir=plugins.d \
110
 
                --config-file=plugin-runner.conf \
111
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
112
 
 
113
 
# Used by run-client
114
 
keydir/secring.gpg: keydir/seckey.txt
115
 
        gpg --homedir $(dir $<) --import $^
116
 
keydir/pubring.gpg: keydir/pubkey.txt
117
 
        gpg --homedir $(dir $<) --import $^
118
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
119
 
        install --directory keydir
120
 
        ./mandos-keygen --dir keydir --force
121
 
 
122
 
# Run the server with a local config
123
 
run-server: confdir/mandos.conf confdir/clients.conf
124
 
        ./mandos --debug --configdir=confdir
125
 
 
126
 
# Used by run-server
127
 
confdir/mandos.conf: mandos.conf
128
 
        install --directory confdir
129
 
        install $^ $@
130
 
confdir/clients.conf: clients.conf keydir/seckey.txt
131
 
        install --directory confdir
132
 
        install clients.conf $@
133
 
# Add a client password
134
 
        ./mandos-keygen --dir keydir --password >> $@
 
99
                --options-for=password-request:--keydir=keydir
 
100
 
 
101
run-server:
 
102
        ./mandos --debug --configdir=.
135
103
 
136
104
install: install-server install-client
137
105
 
138
106
install-server: doc
139
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
107
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
140
108
                $(MANDIR)/man8
141
109
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
142
110
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
150
118
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
151
119
 
152
120
install-client: all doc /usr/share/initramfs-tools/hooks/.
153
 
        install --directory --parents $(PREFIX)/lib/mandos \
154
 
                $(CONFDIR) $(MANDIR)/man8
155
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
121
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
 
122
                $(MANDIR)/man8
 
123
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
156
124
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
157
125
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
158
126
                plugin-runner