/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 01:14:02 UTC
  • mfrom: (257.1.1 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090110011402-lils5ov6elqmk0sh
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 \
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
13
 
LINK_FORTIFY_LD=-z relro -z now
14
 
LINK_FORTIFY=
15
 
ifndef BROKEN_PIE
16
 
FORTIFY += -fPIE
17
 
LINK_FORTIFY_LD += -fPIE
18
 
LINK_FORTIFY += -pie
19
 
endif
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
20
15
#COVERAGE=--coverage
21
16
OPTIMIZE=-Os
22
17
LANGUAGE=-std=gnu99
23
18
htmldir=man
24
 
version=1.0.14
 
19
version=1.0.3
25
20
SED=sed
26
21
 
27
22
## Use these settings for a traditional /usr/local install
40
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
41
36
##
42
37
 
43
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
44
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
45
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
46
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
47
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
48
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
49
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
50
44
 
51
45
# Do not change these two
52
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
83
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
84
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
85
79
CPROGS=plugin-runner $(PLUGINS)
86
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
87
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
88
82
        plugins.d/mandos-client.8mandos \
89
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
157
151
# Update all these files with version number $(version)
158
152
common.ent: Makefile
159
153
        $(SED) --in-place \
160
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
161
155
                $@
162
156
 
163
157
mandos: Makefile
170
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
165
                $@
172
166
 
173
 
mandos-ctl: Makefile
 
167
mandos-list: Makefile
174
168
        $(SED) --in-place \
175
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
170
                $@
209
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
210
204
        ./plugin-runner --plugin-dir=plugins.d \
211
205
                --config-file=plugin-runner.conf \
212
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
213
 
                $(CLIENTARGS)
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
214
207
 
215
208
# Used by run-client
216
209
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
219
212
 
220
213
# Run the server with a local config
221
214
run-server: confdir/mandos.conf confdir/clients.conf
222
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
215
        ./mandos --debug --configdir=confdir
223
216
 
224
217
# Used by run-server
225
218
confdir/mandos.conf: mandos.conf
291
284
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
292
285
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
293
286
        install initramfs-tools-script \
294
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
287
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
295
288
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
296
289
        gzip --best --to-stdout mandos-keygen.8 \
297
290
                > $(MANDIR)/man8/mandos-keygen.8.gz
338
331
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
339
332
                $(INITRAMFSTOOLS)/hooks/mandos \
340
333
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
341
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
334
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
342
335
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
343
336
                $(MANDIR)/man8/mandos-keygen.8.gz \
344
337
                $(MANDIR)/man8/password-prompt.8mandos.gz \