/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

* mandos-monitor.xml: New.
* Makefile (PROGS): Add "mandos-monitor".
  (DOCS): Add "mandos-monitor.xml".
  (mandos-monitor.8, mandos-monitor.8.xhtml, mandos-monitor): New.
  (install-server): Install "mandos-ctl" and "mandos-monitor" too.
  (uninstall-server): Remove "mandos-ctl" and "mandos-monitor" too.
* mandos-monitor: Don't log uninteresting messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.4.1
 
26
version=1.0.14
27
27
SED=sed
28
28
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
59
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
56
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
58
 
64
59
# Commands to format a DocBook <refentry> document into a manual page
65
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
65
        --param man.authors.section.enabled     0 \
71
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
76
69
# DocBook-to-man post-processing to fix a '\n' escape bug
77
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
71
 
94
87
        plugins.d/plymouth
95
88
CPROGS=plugin-runner $(PLUGINS)
96
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
97
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
98
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
91
        mandos-monitor.8 \
99
92
        plugins.d/mandos-client.8mandos \
100
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
101
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
102
 
        plugins.d/plymouth.8mandos intro.8mandos
 
93
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
94
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
95
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
103
96
 
104
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
98
 
126
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
120
        $(DOCBOOKTOHTML)
128
121
 
129
 
intro.8mandos: intro.xml common.ent legalnotice.xml
130
 
        $(DOCBOOKTOMAN)
131
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
123
                legalnotice.xml
136
124
        $(DOCBOOKTOMAN)
152
140
                 legalnotice.xml
153
141
        $(DOCBOOKTOHTML)
154
142
 
155
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
156
 
                legalnotice.xml
157
 
        $(DOCBOOKTOMAN)
158
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
159
 
                 legalnotice.xml
160
 
        $(DOCBOOKTOHTML)
161
 
 
162
143
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
144
                legalnotice.xml
164
145
        $(DOCBOOKTOMAN)
222
203
                $@)
223
204
 
224
205
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
206
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
207
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
208
 
228
209
.PHONY : all doc html clean distclean run-client run-server install \
229
210
        install-server install-client uninstall uninstall-server \
235
216
distclean: clean
236
217
mostlyclean: clean
237
218
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
219
        -rm --force --recursive keydir confdir
239
220
 
240
221
check:  all
241
222
        ./mandos --check
255
236
        @echo "###################################################################"
256
237
        ./plugin-runner --plugin-dir=plugins.d \
257
238
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
239
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
259
240
                $(CLIENTARGS)
260
241
 
261
242
# Used by run-client
265
246
 
266
247
# Run the server with a local config
267
248
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
249
        @echo "#################################################################"
 
250
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
251
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
252
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
253
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
254
        @echo "#################################################################"
 
255
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
256
 
271
257
# Used by run-server
272
258
confdir/mandos.conf: mandos.conf
277
263
        install --mode=u=rw $< $@
278
264
# Add a client password
279
265
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
266
 
283
267
install: install-server install-client-nokey
284
268
 
289
273
 
290
274
install-server: doc
291
275
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
276
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
295
277
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
296
278
                mandos-ctl
311
293
        fi
312
294
        gzip --best --to-stdout mandos.8 \
313
295
                > $(MANDIR)/man8/mandos.8.gz
314
 
        gzip --best --to-stdout mandos-monitor.8 \
315
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
316
 
        gzip --best --to-stdout mandos-ctl.8 \
317
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
318
296
        gzip --best --to-stdout mandos.conf.5 \
319
297
                > $(MANDIR)/man5/mandos.conf.5.gz
320
298
        gzip --best --to-stdout mandos-clients.conf.5 \
328
306
                install --mode=u=rwx \
329
307
                        --directory "$(CONFDIR)/plugins.d"; \
330
308
        fi
331
 
        install --mode=u=rwx,go=rx --directory \
332
 
                "$(CONFDIR)/network-hooks.d"
333
309
        install --mode=u=rwx,go=rx \
334
310
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
335
311
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
363
339
                > $(MANDIR)/man8/mandos-keygen.8.gz
364
340
        gzip --best --to-stdout plugin-runner.8mandos \
365
341
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
342
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
343
                > $(MANDIR)/man8/password-prompt.8mandos.gz
366
344
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
367
345
                > $(MANDIR)/man8/mandos-client.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
369
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
370
346
        gzip --best --to-stdout plugins.d/usplash.8mandos \
371
347
                > $(MANDIR)/man8/usplash.8mandos.gz
372
348
        gzip --best --to-stdout plugins.d/splashy.8mandos \
373
349
                > $(MANDIR)/man8/splashy.8mandos.gz
374
350
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
375
351
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
376
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
377
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
378
352
 
379
353
install-client: install-client-nokey
380
354
# Post-installation stuff
389
363
                $(PREFIX)/sbin/mandos-ctl \
390
364
                $(PREFIX)/sbin/mandos-monitor \
391
365
                $(MANDIR)/man8/mandos.8.gz \
392
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
393
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
394
366
                $(MANDIR)/man5/mandos.conf.5.gz \
395
367
                $(MANDIR)/man5/mandos-clients.conf.5.gz
396
368
        update-rc.d -f mandos remove
412
384
                $(INITRAMFSTOOLS)/hooks/mandos \
413
385
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
414
386
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
387
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
415
388
                $(MANDIR)/man8/mandos-keygen.8.gz \
416
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
418
389
                $(MANDIR)/man8/password-prompt.8mandos.gz \
419
390
                $(MANDIR)/man8/usplash.8mandos.gz \
420
391
                $(MANDIR)/man8/splashy.8mandos.gz \
421
392
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
422
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
393
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
394
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
424
395
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
425
396
        update-initramfs -k all -u