/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 at bsnet
  • Date: 2010-08-10 19:08:24 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: teddy@fukt.bsnet.se-20100810190824-5yquozxy4kh6py3f
* plugins.d/mandos-client.c: An empty interface name now means to
                             autodetect an interface; to specify no
                             particular interface, use "none".
  (sys_class_net): New global variable for the "/sys/class/net" path.
  (good_interface): New function to determine the suitability of an
                    interface.  Used by a scandir() call in main().
  (main): Changed default value for "interface" to the empty string.
          Moved "connect_to" to be a global variable.  Only take down
          and up interface if its name is not "none".
* plugins.d/mandos-client.xml (OPTIONS): Update documentation for the
                                         "--interface" option.

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