/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
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
 
LINK_FORTIFY_LD=-z relro -fPIE
15
 
LINK_FORTIFY=-pie
 
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
16
23
#COVERAGE=--coverage
17
24
OPTIMIZE=-Os
18
25
LANGUAGE=-std=gnu99
19
26
htmldir=man
20
 
version=1.0.12
 
27
version=1.0.14
21
28
SED=sed
22
29
 
23
30
## Use these settings for a traditional /usr/local install
51
58
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
52
59
 
53
60
# Commands to format a DocBook <refentry> document into a manual page
54
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
61
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
55
62
        --param man.charmap.use.subset          0 \
56
63
        --param make.year.ranges                1 \
57
64
        --param make.single.year.ranges         1 \
59
66
        --param man.authors.section.enabled     0 \
60
67
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
61
68
        $(notdir $<); \
62
 
        $(MANPOST) $(notdir $@)
 
69
        $(MANPOST) $(notdir $@))
63
70
# DocBook-to-man post-processing to fix a '\n' escape bug
64
71
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
65
72
 
66
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
73
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
67
74
        --param make.year.ranges                1 \
68
75
        --param make.single.year.ranges         1 \
69
76
        --param man.output.quietly              1 \
71
78
        --param citerefentry.link               1 \
72
79
        --output $@ \
73
80
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
74
 
        $<; $(HTMLPOST) $@
 
81
        $<; $(HTMLPOST) $@)
75
82
# Fix citerefentry links
76
83
HTMLPOST=$(SED) --in-place \
77
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'
152
159
 
153
160
# Update all these files with version number $(version)
154
161
common.ent: Makefile
155
 
        $(SED) --in-place \
 
162
        $(strip $(SED) --in-place \
156
163
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
157
 
                $@
 
164
                $@)
158
165
 
159
166
mandos: Makefile
160
 
        $(SED) --in-place \
 
167
        $(strip $(SED) --in-place \
161
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
162
 
                $@
 
169
                $@)
163
170
 
164
171
mandos-keygen: Makefile
165
 
        $(SED) --in-place \
 
172
        $(strip $(SED) --in-place \
166
173
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
167
 
                $@
 
174
                $@)
168
175
 
169
176
mandos-ctl: Makefile
170
 
        $(SED) --in-place \
 
177
        $(strip $(SED) --in-place \
171
178
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
172
 
                $@
 
179
                $@)
173
180
 
174
181
mandos.lsm: Makefile
175
 
        $(SED) --in-place \
 
182
        $(strip $(SED) --in-place \
176
183
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
177
 
                $@
178
 
        $(SED) --in-place \
 
184
                $@)
 
185
        $(strip $(SED) --in-place \
179
186
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
180
 
                $@
181
 
        $(SED) --in-place \
 
187
                $@)
 
188
        $(strip $(SED) --in-place \
182
189
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
183
 
                $@
 
190
                $@)
184
191
 
185
 
plugins.d/mandos-client: plugins.d/mandos-client.o
186
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
187
 
                $(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 $@
188
195
 
189
196
.PHONY : all doc html clean distclean run-client run-server install \
190
197
        install-server install-client uninstall uninstall-server \