/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-11-15 10:12:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091115101209-d0zrfwkp6u0l7v7b
* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

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 \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
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
 
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>.
 
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
14
LINK_FORTIFY_LD=-z relro -z now
 
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
 
18
ifndef BROKEN_PIE
 
19
FORTIFY += -fPIE
 
20
LINK_FORTIFY_LD += -fPIE
 
21
LINK_FORTIFY += -pie
 
22
endif
14
23
#COVERAGE=--coverage
15
24
OPTIMIZE=-Os
16
25
LANGUAGE=-std=gnu99
17
26
htmldir=man
18
 
version=1.0.2
 
27
version=1.0.14
19
28
SED=sed
20
29
 
21
30
## Use these settings for a traditional /usr/local install
34
43
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
35
44
##
36
45
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
46
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
47
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
48
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
49
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
50
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
51
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
52
        getconf LFS_LDFLAGS)
43
53
 
44
54
# Do not change these two
45
55
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
56
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
57
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
58
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
59
 
50
60
# Commands to format a DocBook <refentry> document into a manual page
51
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
61
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
52
62
        --param man.charmap.use.subset          0 \
53
63
        --param make.year.ranges                1 \
54
64
        --param make.single.year.ranges         1 \
56
66
        --param man.authors.section.enabled     0 \
57
67
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
68
        $(notdir $<); \
59
 
        $(MANPOST) $(notdir $@)
 
69
        $(MANPOST) $(notdir $@))
60
70
# DocBook-to-man post-processing to fix a '\n' escape bug
61
71
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
62
72
 
63
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
73
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
64
74
        --param make.year.ranges                1 \
65
75
        --param make.single.year.ranges         1 \
66
76
        --param man.output.quietly              1 \
68
78
        --param citerefentry.link               1 \
69
79
        --output $@ \
70
80
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
 
        $<; $(HTMLPOST) $@
 
81
        $<; $(HTMLPOST) $@)
72
82
# Fix citerefentry links
73
 
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
83
HTMLPOST=$(SED) --in-place \
 
84
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
74
85
 
75
86
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
76
87
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
77
88
CPROGS=plugin-runner $(PLUGINS)
78
 
PROGS=mandos mandos-keygen $(CPROGS)
 
89
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
79
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
80
91
        plugins.d/mandos-client.8mandos \
81
92
        plugins.d/password-prompt.8mandos mandos.conf.5 \
148
159
 
149
160
# Update all these files with version number $(version)
150
161
common.ent: Makefile
151
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
162
        $(strip $(SED) --in-place \
 
163
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
164
                $@)
152
165
 
153
166
mandos: Makefile
154
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
167
        $(strip $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@)
155
170
 
156
171
mandos-keygen: Makefile
157
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
172
        $(strip $(SED) --in-place \
 
173
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
174
                $@)
 
175
 
 
176
mandos-ctl: Makefile
 
177
        $(strip $(SED) --in-place \
 
178
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
179
                $@)
158
180
 
159
181
mandos.lsm: Makefile
160
 
        $(SED) --in-place --expression='s/^\(Version:\).*/\1\t$(version)/' $@
161
 
        $(SED) --in-place --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' $@
 
182
        $(strip $(SED) --in-place \
 
183
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
184
                $@)
 
185
        $(strip $(SED) --in-place \
 
186
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
187
                $@)
 
188
        $(strip $(SED) --in-place \
 
189
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
190
                $@)
162
191
 
163
 
plugins.d/mandos-client: plugins.d/mandos-client.o
164
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
165
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
192
plugins.d/mandos-client: plugins.d/mandos-client.c
 
193
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
194
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
166
195
 
167
196
.PHONY : all doc html clean distclean run-client run-server install \
168
197
        install-server install-client uninstall uninstall-server \
183
212
run-client: all keydir/seckey.txt keydir/pubkey.txt
184
213
        ./plugin-runner --plugin-dir=plugins.d \
185
214
                --config-file=plugin-runner.conf \
186
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
215
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
216
                $(CLIENTARGS)
187
217
 
188
218
# Used by run-client
189
219
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
192
222
 
193
223
# Run the server with a local config
194
224
run-server: confdir/mandos.conf confdir/clients.conf
195
 
        ./mandos --debug --configdir=confdir
 
225
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
196
226
 
197
227
# Used by run-server
198
228
confdir/mandos.conf: mandos.conf
206
236
 
207
237
install: install-server install-client-nokey
208
238
 
209
 
install-html: $(htmldocs)
 
239
install-html: html
210
240
        install --directory $(htmldir)
211
241
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
212
242
                $(htmldocs)
264
294
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
265
295
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
266
296
        install initramfs-tools-script \
267
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
297
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
268
298
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
269
299
        gzip --best --to-stdout mandos-keygen.8 \
270
300
                > $(MANDIR)/man8/mandos-keygen.8.gz
311
341
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
312
342
                $(INITRAMFSTOOLS)/hooks/mandos \
313
343
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
314
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
344
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
315
345
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
316
346
                $(MANDIR)/man8/mandos-keygen.8.gz \
317
347
                $(MANDIR)/man8/password-prompt.8mandos.gz \