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