/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-08 03:54:06 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090108035406-01uqkv9xqgxlnw7c
Change the default value of the "checker" option command to make the
checker command be run-time dependent on the "host" client attribute
instead of reading it only once on startup:

* clients.conf (checker): Changed default commented-out value to
                          "fping -q -- %%(host)s".
* mandos (main): Changed default value for the "checker" config option
                 to "fping -q -- %%(host)s".
* mandos-clients.conf.xml (OPTIONS): Document changed default value.
  (EXAMPLE): Changed value of "checker".

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
15
15
OPTIMIZE=-Os
16
16
LANGUAGE=-std=gnu99
17
17
htmldir=man
18
 
version=1.0.2
 
18
version=1.0.3
19
19
SED=sed
20
20
 
21
21
## Use these settings for a traditional /usr/local install
45
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
47
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
49
49
 
50
50
# Commands to format a DocBook <refentry> document into a manual page
51
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
76
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
78
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
80
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
81
        plugins.d/mandos-client.8mandos \
82
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
163
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
164
                $@
165
165
 
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@
 
170
 
166
171
mandos.lsm: Makefile
167
172
        $(SED) --in-place \
168
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
170
175
        $(SED) --in-place \
171
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
172
177
                $@
 
178
        $(SED) --in-place \
 
179
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
180
                $@
173
181
 
174
182
plugins.d/mandos-client: plugins.d/mandos-client.o
175
183
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \