/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

* plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to
                            check its return code.  Use exit codes
                            from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
                       exec the "splashy_update" command.

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