/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-19 13:25:14 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080819132514-wawrvgmfjovg9poj
* Makefile (DOCBOOKTOMAN): Added "--xinclude".

* mandos-options.xml: New file; moved mandos(8) option descriptions
                      here.

* mandos.conf.xml: Add XInclude namespace.
  (OPTIONS): New separate section with options from old "DESCRIPTION"
             section.  Changed all options to include a synopsis and
             include its paragraph from "mandos-options.xml".
  (FILES): Moved to before "EXAMPLES".
  (BUGS): New section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).  Unindented
              example text.

* mandos.xml: Removed OVERVIEW entity.  Add XInclude namespace.
  (OPTIONS): Moved all descriptive paragraphs to "mandos-options.xml"
             and just <xi:include/> them from here.
  (OVERVIEW): Changed to do <xi:include/>.

* overview.xml: Added DOCTYPE; reportedly needed for XInclude to work.

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)
32
32
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
33
33
LDFLAGS=$(COVERAGE)
34
34
 
35
 
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
35
DOCBOOKTOMAN=xsltproc --nonet --xinclude \
37
36
        --param man.charmap.use.subset          0 \
38
37
        --param make.year.ranges                1 \
39
38
        --param make.single.year.ranges         1 \
40
39
        --param man.output.quietly              1 \
41
40
        --param man.authors.section.enabled     0 \
42
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
43
 
        $(notdir $<); \
44
 
        $(MANPOST) $(notdir $@)
 
41
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
45
42
# 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'
 
43
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
47
44
 
48
45
PLUGINS=plugins.d/password-prompt plugins.d/password-request
49
46
PROGS=plugin-runner $(PLUGINS)
59
56
doc: $(DOCS)
60
57
 
61
58
%.5: %.xml
62
 
        $(DOCBOOKTOMAN)
 
59
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
63
60
 
64
61
%.8: %.xml
65
 
        $(DOCBOOKTOMAN)
 
62
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
66
63
 
67
64
%.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
74
 
        $(DOCBOOKTOMAN)
 
65
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
75
66
 
76
67
plugins.d/password-request: plugins.d/password-request.o
77
68
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
87
78
distclean: clean
88
79
mostlyclean: clean
89
80
maintainer-clean: clean
90
 
        -rm --force --recursive keydir confdir
 
81
        -rm --force --recursive keydir
91
82
 
92
83
check:
93
84
        ./mandos --check
94
85
 
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
 
86
run-client: all
 
87
        -mkdir keydir
 
88
        -./mandos-keygen --dir keydir
98
89
        ./plugin-runner --plugin-dir=plugins.d \
99
90
                --options-for=password-request:--keydir=keydir
100
91
 
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 >> $@
 
92
run-server:
 
93
        ./mandos --debug --configdir=.
123
94
 
124
95
install: install-server install-client
125
96
 
126
97
install-server: doc
127
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
98
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
128
99
                $(MANDIR)/man8
129
100
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
130
101
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
138
109
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
139
110
 
140
111
install-client: all doc /usr/share/initramfs-tools/hooks/.
141
 
        install --directory --parents $(PREFIX)/lib/mandos \
142
 
                $(CONFDIR) $(MANDIR)/man8
143
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
112
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
 
113
                $(MANDIR)/man8
 
114
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
144
115
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
145
116
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
146
117
                plugin-runner