/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-09-03 05:04:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080903050440-7cwzxestx6pvdy1i
* Makefile (mandos.8): Add dependency on "overview.xml" and
                       "legalnotice.xml".
  (mandos-keygen.8): New target.
  (mandos-conf.5): Added dependency on "legalnotice.xml".
  (plugin-runner.8mandos): New target
  (plugins.d/password-request.8mandos): - '' -

* mandos-options.xml (priority): Make wording server/client neutral.

* plugins.d/password-request.c (main): Changed .arg fields of the argp
                                       options struct to be more
                                       consistent with the manual.

* plugins.d/password-request.xml (OVERVIEW): Moved to after "OPTIONS".
  (OPTIONS): Improved wording and names of replaceables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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 \
58
58
 
59
59
doc: $(DOCS)
60
60
 
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
 
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
74
85
        $(DOCBOOKTOMAN)
75
86
 
76
87
plugins.d/password-request: plugins.d/password-request.o
87
98
distclean: clean
88
99
mostlyclean: clean
89
100
maintainer-clean: clean
90
 
        -rm --force --recursive keydir
 
101
        -rm --force --recursive keydir confdir
91
102
 
92
103
check:
93
104
        ./mandos --check
94
105
 
95
 
run-client: all
96
 
        -mkdir keydir
97
 
        -./mandos-keygen --dir keydir
 
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
98
109
        ./plugin-runner --plugin-dir=plugins.d \
 
110
                --config-file=plugin-runner.conf \
99
111
                --options-for=password-request:--keydir=keydir
100
112
 
101
 
run-server:
102
 
        ./mandos --debug --configdir=.
 
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 >> $@
103
135
 
104
136
install: install-server install-client
105
137