/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

Fix compilation error on AMD64, thanks to Frans Pop
<elendil@planet.nl> for the report, thanks to Mooie <mooie@cow.se> for
the fix:

* Makefile (FORTIFY): Replaced "-pie" with "-fPIC".
  (LINK_FORTIFY): Renamed to "LINK_FORTIFY_LD" and added "-fPIE".
  (LINK_FORTIFY): New; set to "-pie".
  (LDFLAGS): Also include "$(LINK_FORTIFY)" (unmodified).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
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 --no-dbus --configdir=confdir $(SERVERARGS)
 
215
        ./mandos --debug --configdir=confdir
217
216
 
218
217
# Used by run-server
219
218
confdir/mandos.conf: mandos.conf
285
284
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
285
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
286
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
287
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
289
288
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
289
        gzip --best --to-stdout mandos-keygen.8 \
291
290
                > $(MANDIR)/man8/mandos-keygen.8.gz
332
331
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
332
                $(INITRAMFSTOOLS)/hooks/mandos \
334
333
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
334
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
336
335
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
336
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
337
                $(MANDIR)/man8/password-prompt.8mandos.gz \