/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: Mooie
  • Date: 2009-01-10 00:53:09 UTC
  • mto: (237.2.21 mandos)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: mooie@thinkmoo-20090110005309-1f1uhhvrif4tg6ev
Updated Makefile to use -fPIC.
Updated Makefile to use -pie and -fPIE correctly.

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 \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
13
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
13
LINK_FORTIFY_LD=-z relro -fPIE
15
14
LINK_FORTIFY=-pie
17
16
OPTIMIZE=-Os
18
17
LANGUAGE=-std=gnu99
19
18
htmldir=man
20
 
version=1.0.13
 
19
version=1.0.3
21
20
SED=sed
22
21
 
23
22
## Use these settings for a traditional /usr/local install
36
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
37
36
##
38
37
 
39
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
40
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
41
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
42
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
43
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
44
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
45
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
46
44
 
47
45
# Do not change these two
48
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
79
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
80
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
81
79
CPROGS=plugin-runner $(PLUGINS)
82
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
83
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
84
82
        plugins.d/mandos-client.8mandos \
85
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
153
151
# Update all these files with version number $(version)
154
152
common.ent: Makefile
155
153
        $(SED) --in-place \
156
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
157
155
                $@
158
156
 
159
157
mandos: Makefile
166
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
167
165
                $@
168
166
 
169
 
mandos-ctl: Makefile
 
167
mandos-list: Makefile
170
168
        $(SED) --in-place \
171
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
172
170
                $@
205
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
206
204
        ./plugin-runner --plugin-dir=plugins.d \
207
205
                --config-file=plugin-runner.conf \
208
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
209
 
                $(CLIENTARGS)
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
210
207
 
211
208
# Used by run-client
212
209
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
215
212
 
216
213
# Run the server with a local config
217
214
run-server: confdir/mandos.conf confdir/clients.conf
218
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
215
        ./mandos --debug --configdir=confdir
219
216
 
220
217
# Used by run-server
221
218
confdir/mandos.conf: mandos.conf
287
284
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
288
285
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
289
286
        install initramfs-tools-script \
290
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
287
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
291
288
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
292
289
        gzip --best --to-stdout mandos-keygen.8 \
293
290
                > $(MANDIR)/man8/mandos-keygen.8.gz
334
331
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
335
332
                $(INITRAMFSTOOLS)/hooks/mandos \
336
333
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
337
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
334
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
338
335
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
339
336
                $(MANDIR)/man8/mandos-keygen.8.gz \
340
337
                $(MANDIR)/man8/password-prompt.8mandos.gz \