/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: 2009-01-06 20:22:18 UTC
  • mfrom: (237.2.14 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090106202218-znyzociuf8ojl93s
Merge from trunk; fixes for debian/changelog suggested by sponsor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
15
14
#COVERAGE=--coverage
16
15
OPTIMIZE=-Os
17
16
LANGUAGE=-std=gnu99
18
17
htmldir=man
19
 
version=1.0.5
 
18
version=1.0.3
20
19
SED=sed
21
20
 
22
21
## Use these settings for a traditional /usr/local install
46
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
47
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
50
49
 
51
50
# Commands to format a DocBook <refentry> document into a manual page
52
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
77
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
78
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
79
PROGS=mandos mandos-keygen $(CPROGS)
81
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
81
        plugins.d/mandos-client.8mandos \
83
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
164
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
164
                $@
166
165
 
167
 
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
171
 
 
172
166
mandos.lsm: Makefile
173
167
        $(SED) --in-place \
174
168
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
176
170
        $(SED) --in-place \
177
171
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
172
                $@
179
 
        $(SED) --in-place \
180
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
182
173
 
183
174
plugins.d/mandos-client: plugins.d/mandos-client.o
184
175
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
203
194
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
195
        ./plugin-runner --plugin-dir=plugins.d \
205
196
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
197
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
208
198
 
209
199
# Used by run-client
210
200
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
213
203
 
214
204
# Run the server with a local config
215
205
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
206
        ./mandos --debug --configdir=confdir
217
207
 
218
208
# Used by run-server
219
209
confdir/mandos.conf: mandos.conf
285
275
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
276
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
277
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
278
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
289
279
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
280
        gzip --best --to-stdout mandos-keygen.8 \
291
281
                > $(MANDIR)/man8/mandos-keygen.8.gz
332
322
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
323
                $(INITRAMFSTOOLS)/hooks/mandos \
334
324
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
325
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
336
326
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
327
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
328
                $(MANDIR)/man8/password-prompt.8mandos.gz \