/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

* plugin-runner.c: Whitespace changes only.

* plugins.d/mandos-client.c: Wrap calls to klogctl() inside "#ifdef
                             __linux__".  Detect and show any error
                             from nanosleep.

* plugins.d/password-prompt.c: Whitespace changes only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
16
16
OPTIMIZE=-Os
17
17
LANGUAGE=-std=gnu99
18
18
htmldir=man
19
 
version=1.0.3
 
19
version=1.0.5
20
20
SED=sed
21
21
 
22
22
## Use these settings for a traditional /usr/local install
77
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
79
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
82
        plugins.d/mandos-client.8mandos \
83
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
164
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
165
                $@
166
166
 
167
 
mandos-list: Makefile
 
167
mandos-ctl: Makefile
168
168
        $(SED) --in-place \
169
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
170
                $@
213
213
 
214
214
# Run the server with a local config
215
215
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
217
217
 
218
218
# Used by run-server
219
219
confdir/mandos.conf: mandos.conf