/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

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