/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

  • Committer: teddy at bsnet
  • Date: 2010-08-10 19:08:24 UTC
  • mto: (237.2.182 mandos-local)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: teddy@fukt.bsnet.se-20100810190824-5yquozxy4kh6py3f
* plugins.d/mandos-client.c: An empty interface name now means to
                             autodetect an interface; to specify no
                             particular interface, use "none".
  (sys_class_net): New global variable for the "/sys/class/net" path.
  (good_interface): New function to determine the suitability of an
                    interface.  Used by a scandir() call in main().
  (main): Changed default value for "interface" to the empty string.
          Moved "connect_to" to be a global variable.  Only take down
          and up interface if its name is not "none".
* plugins.d/mandos-client.xml (OPTIONS): Update documentation for the
                                         "--interface" option.

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