/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-11 00:25:22 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091111002522-t416fifqw46xaqn4
* debian/rules: Only set BROKEN_PIE if binutils is a specific range of
                versions.
* mandos-monitor (MandosClientWidget.keypress): Also accept "Ctrl-K"
                                                for removing client.
  (UserInterface.__init__): Use non-bold line drawing charater.
  (UserInterface.log_message): Scroll to bottom.
  (UserInterface.process_input): Also show help on "ESC" key.

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