/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-04-14 03:36:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090414033605-ao45swlzyvmahc8y
Minor code cleanup, and a bug fix.

* mandos: Added blank second line in doc strings.
  (SO_BINDTODEVICE): New global constant.
  (TCP_handler): Renamed to "ClientHandler".  All users changed.
  (ClientHandler.handle): Get GnuTLS priority directly from
                          server.gnutls_priority instead of
                          server.settings["priority"].
  (IPv6_TCPServer): Do not use super() anywhere.
  (IPv6_TCPServer.__init__) Do not receive "settings" dict, get all
                            the relevant settings separately as
                            keyword arguments.  All callers changed.
  (IPv6_TCPServer.server_bind): Use global SO_BINDTODEVICE.  Bug fix:
                               add NUL character to interface name.
                               Use "self.interface" directly instead
                               of "self.settings['interface']".
  (IPv6_TCPServer.handle_ipc): Use "self.use_dbus" directly instead of
                               "self.settings['use_dbus']".

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