/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

* 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
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 -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-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
15
23
#COVERAGE=--coverage
16
24
OPTIMIZE=-Os
17
25
LANGUAGE=-std=gnu99
18
26
htmldir=man
19
 
version=1.0.5
 
27
version=1.0.14
20
28
SED=sed
21
29
 
22
30
## Use these settings for a traditional /usr/local install
35
43
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
44
##
37
45
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
46
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
47
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
48
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
49
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
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)
44
53
 
45
54
# Do not change these two
46
55
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
49
58
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
50
59
 
51
60
# Commands to format a DocBook <refentry> document into a manual page
52
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
61
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
53
62
        --param man.charmap.use.subset          0 \
54
63
        --param make.year.ranges                1 \
55
64
        --param make.single.year.ranges         1 \
57
66
        --param man.authors.section.enabled     0 \
58
67
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
59
68
        $(notdir $<); \
60
 
        $(MANPOST) $(notdir $@)
 
69
        $(MANPOST) $(notdir $@))
61
70
# DocBook-to-man post-processing to fix a '\n' escape bug
62
71
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
63
72
 
64
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
73
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
65
74
        --param make.year.ranges                1 \
66
75
        --param make.single.year.ranges         1 \
67
76
        --param man.output.quietly              1 \
69
78
        --param citerefentry.link               1 \
70
79
        --output $@ \
71
80
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
 
        $<; $(HTMLPOST) $@
 
81
        $<; $(HTMLPOST) $@)
73
82
# Fix citerefentry links
74
83
HTMLPOST=$(SED) --in-place \
75
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'
150
159
 
151
160
# Update all these files with version number $(version)
152
161
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
 
162
        $(strip $(SED) --in-place \
 
163
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
164
                $@)
156
165
 
157
166
mandos: Makefile
158
 
        $(SED) --in-place \
 
167
        $(strip $(SED) --in-place \
159
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
 
169
                $@)
161
170
 
162
171
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
 
172
        $(strip $(SED) --in-place \
164
173
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
 
174
                $@)
166
175
 
167
176
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
 
177
        $(strip $(SED) --in-place \
169
178
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
 
179
                $@)
171
180
 
172
181
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
 
182
        $(strip $(SED) --in-place \
174
183
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
 
184
                $@)
 
185
        $(strip $(SED) --in-place \
177
186
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
 
187
                $@)
 
188
        $(strip $(SED) --in-place \
180
189
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
 
190
                $@)
182
191
 
183
 
plugins.d/mandos-client: plugins.d/mandos-client.o
184
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
 
                $(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 $@
186
195
 
187
196
.PHONY : all doc html clean distclean run-client run-server install \
188
197
        install-server install-client uninstall uninstall-server \