/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-09-05 17:20:46 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090905172046-s92efz3m1j4c1sti
* plugins-runner.c (main): Bug fix: Close config file.

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=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -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 -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
14
15
#COVERAGE=--coverage
15
16
OPTIMIZE=-Os
16
17
LANGUAGE=-std=gnu99
17
18
htmldir=man
18
 
version=1.0.3
 
19
version=1.0.11
19
20
SED=sed
20
21
 
21
22
## Use these settings for a traditional /usr/local install
34
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
35
36
##
36
37
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
39
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
44
        getconf LFS_LDFLAGS)
43
45
 
44
46
# Do not change these two
45
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
49
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
51
 
50
52
# Commands to format a DocBook <refentry> document into a manual page
51
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
76
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
80
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
80
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
83
        plugins.d/mandos-client.8mandos \
82
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
150
152
# Update all these files with version number $(version)
151
153
common.ent: Makefile
152
154
        $(SED) --in-place \
153
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
154
156
                $@
155
157
 
156
158
mandos: Makefile
163
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
166
                $@
165
167
 
166
 
mandos-list: Makefile
 
168
mandos-ctl: Makefile
167
169
        $(SED) --in-place \
168
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
171
                $@
202
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
203
205
        ./plugin-runner --plugin-dir=plugins.d \
204
206
                --config-file=plugin-runner.conf \
205
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
208
                $(CLIENTARGS)
206
209
 
207
210
# Used by run-client
208
211
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
211
214
 
212
215
# Run the server with a local config
213
216
run-server: confdir/mandos.conf confdir/clients.conf
214
 
        ./mandos --debug --configdir=confdir
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
215
218
 
216
219
# Used by run-server
217
220
confdir/mandos.conf: mandos.conf
283
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
284
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
285
288
        install initramfs-tools-script \
286
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
287
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
288
291
        gzip --best --to-stdout mandos-keygen.8 \
289
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
330
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
331
334
                $(INITRAMFSTOOLS)/hooks/mandos \
332
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
333
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
334
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
335
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
336
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \