/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-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:
104
104
        ./mandos --check
105
105
 
106
106
# Run the client with a local config and key
107
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
107
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
108
        keydir/secring.gpg keydir/pubring.gpg
108
109
        ./plugin-runner --plugin-dir=plugins.d \
109
110
                --config-file=plugin-runner.conf \
110
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
111
                --options-for=password-request:--keydir=keydir
111
112
 
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 $^
113
118
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
114
119
        install --directory keydir
115
120
        ./mandos-keygen --dir keydir --force
121
126
# Used by run-server
122
127
confdir/mandos.conf: mandos.conf
123
128
        install --directory confdir
124
 
        install --mode=0644 $^ $@
 
129
        install $^ $@
125
130
confdir/clients.conf: clients.conf keydir/seckey.txt
126
131
        install --directory confdir
127
 
        install --mode=0640 $< $@
 
132
        install clients.conf $@
128
133
# Add a client password
129
134
        ./mandos-keygen --dir keydir --password >> $@
130
135