/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: 2009-01-10 02:39:56 UTC
  • mfrom: (257.1.2 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090110023956-o7f5r8af28fmgahw
Fixed warnings on AMD64, thanks to Mooie <mooie@cow.se> for the patch.

* plugins.d/askpass-fifo.c (main): Cast value from TEMP_FAILURE_RETRY
                                   to int, the value the inner
                                   function returns.
* plugins.d/mandos-client.c (init_gpgme): - '' -
  (start_mandos_communication): New variable "ssize_t sret"; used to
                                store return value from
                                "gnutls_record_recv".  Also cast value
                                from TEMP_FAILURE_RETRY as above.
* plugins.d/usplash.c (usplash_write): New variable "ssize_t sret";
                                       used to store return value from
                                       "write".

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.5
 
19
version=1.0.3
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-ctl $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-list $(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-ctl: Makefile
 
167
mandos-list: Makefile
168
168
        $(SED) --in-place \
169
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
170
                $@
203
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
204
        ./plugin-runner --plugin-dir=plugins.d \
205
205
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
208
207
 
209
208
# Used by run-client
210
209
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
213
212
 
214
213
# Run the server with a local config
215
214
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
215
        ./mandos --debug --configdir=confdir
217
216
 
218
217
# Used by run-server
219
218
confdir/mandos.conf: mandos.conf