/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-10-30 16:27:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091030162717-dun2a9li8bu6jm2w
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
            mandos-keygen, mandos-ctl, mandos.lsm): Add $(strip) to
                                                    make commands
                                                    easier to read
                                                    when run.
           (plugins.d/mandos-client): Use $(LINK.c) to compile in the
                                      same way as the other programs -
                                      i.e. not via an object file.

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