/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-24 07:42:14 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080824074214-odju7g3115le171c
* mandos-keygen: Bug fix: Recognize new options --subtype and
                 --sublength.  New option "--password" which prompts
                 for and encrypts a password with an already existing
                 key.

* mandos-keygen.xml (SYNOPSIS): Added separate synopsis for
                                "--password" option.
  (DESCRIPTION): Added text about password creation.
  (OPTIONS): Document default value for "--dir" option.  Document new
             "--password" option.

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 \
87
87
distclean: clean
88
88
mostlyclean: clean
89
89
maintainer-clean: clean
90
 
        -rm --force --recursive keydir confdir
 
90
        -rm --force --recursive keydir
91
91
 
92
92
check:
93
93
        ./mandos --check
94
94
 
95
 
# Run the server with a local key
96
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
 
        keydir/secring.gpg keydir/pubring.gpg
 
95
run-client: all
 
96
        -mkdir keydir
 
97
        -./mandos-keygen --dir keydir
98
98
        ./plugin-runner --plugin-dir=plugins.d \
99
99
                --options-for=password-request:--keydir=keydir
100
100
 
101
 
# Used by run-client
102
 
keydir/secring.gpg: keydir/seckey.txt
103
 
        gpg --homedir $(dir $<) --import $^
104
 
keydir/pubring.gpg: keydir/pubkey.txt
105
 
        gpg --homedir $(dir $<) --import $^
106
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
107
 
        install --directory keydir
108
 
        ./mandos-keygen --dir keydir --force
109
 
 
110
 
# Run the server with a local config
111
 
run-server: confdir/mandos.conf confdir/clients.conf
112
 
        ./mandos --debug --configdir=confdir
113
 
 
114
 
# Used by run-server
115
 
confdir/mandos.conf: mandos.conf
116
 
        install --directory confdir
117
 
        install $^ $@
118
 
confdir/clients.conf: clients.conf keydir/seckey.txt
119
 
        install --directory confdir
120
 
        install clients.conf $@
121
 
# Add a client password
122
 
        ./mandos-keygen --dir keydir --password >> $@
 
101
run-server:
 
102
        ./mandos --debug --configdir=.
123
103
 
124
104
install: install-server install-client
125
105