/mandos/trunk : revision 402

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-11-05 01:59:51 UTC
Revision ID: teddy@fukt.bsnet.se-20091105015951-r8rm31afqy2qbh8k

* mandos (Client.disable): Rename keyword argument "log" to "quiet",
                           with inverted sense.  All callers changed.
  (ClientDBus.disable): Rename keyword argument "signal" to "quiet",
                        with inverted sense.  All callers changed.
  (main): Disable D-Bus use if bus name is not available on system bus.
  (main.cleanup): Bug fix: Only do "remove_from_connection" on clients
                  when using D-Bus.
* plugin-runner.c (main): Return EX_OSERR if a bad error happened when
                          trying to open config file.

Show diffs side-by-side

added added

removed removed

Makefile

# -Wunreachable-code

#DEBUG=-ggdb3

# For info about _FORTIFY_SOURCE, see

# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>

FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE

LINK_FORTIFY_LD=-z relro -fPIE

LINK_FORTIFY=-pie

# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>

# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.

FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC

LINK_FORTIFY_LD=-z relro -z now

LINK_FORTIFY=

# If BROKEN_PIE is set, do not build with -pie

ifndef BROKEN_PIE

FORTIFY += -fPIE

LINK_FORTIFY_LD += -fPIE

LINK_FORTIFY += -pie

endif

#COVERAGE=--coverage

OPTIMIZE=-Os

LANGUAGE=-std=gnu99

htmldir=man

version=1.0.7

version=1.0.14

SED=sed

## Use these settings for a traditional /usr/local install

INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools

GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)

GNUTLS_LIBS=$(shell libgnutls-config --libs)

GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)

GNUTLS_LIBS=$(shell pkg-config --libs gnutls)

AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)

AVAHI_LIBS=$(shell pkg-config --libs avahi-core)

GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)

LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))

# Commands to format a DocBook <refentry> document into a manual page

DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \

DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \

--param man.charmap.use.subset 0 \

--param make.year.ranges 1 \

--param make.single.year.ranges 1 \

--param man.authors.section.enabled 0 \

/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \

$(notdir $<); \

$(MANPOST) $(notdir $@)

$(MANPOST) $(notdir $@))

# DocBook-to-man post-processing to fix a '\n' escape bug

MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'

DOCBOOKTOHTML=xsltproc --nonet --xinclude \

DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \

--param make.year.ranges 1 \

--param make.single.year.ranges 1 \

--param man.output.quietly 1 \

--param citerefentry.link 1 \

--output $@ \

/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \

$<; $(HTMLPOST) $@

$<; $(HTMLPOST) $@)

# Fix citerefentry links

HTMLPOST=$(SED) --in-place \

--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

159

152

160

# Update all these files with version number $(version)

153

161

common.ent: Makefile

154

$(SED) --in-place \

162

$(strip $(SED) --in-place \

155

163

--expression='s/^$<!ENTITY version "$[^"]*">$$/\1$(version)">/' \

156

164

$@)

157

165

158

166

mandos: Makefile

159

$(SED) --in-place \

167

$(strip $(SED) --in-place \

160

168

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

161

169

$@)

162

170

163

171

mandos-keygen: Makefile

164

$(SED) --in-place \

172

$(strip $(SED) --in-place \

165

173

--expression='s/^$VERSION="$[^"]*"$$/\1$(version)"/' \

166

174

$@)

167

175

168

176

mandos-ctl: Makefile

169

$(SED) --in-place \

177

$(strip $(SED) --in-place \

170

178

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

171

179

$@)

172

180

173

181

mandos.lsm: Makefile

174

$(SED) --in-place \

182

$(strip $(SED) --in-place \

175

183

--expression='s/^$Version:$.*/\1\t$(version)/' \

176

177

$(SED) --in-place \

184

$@)

185

$(strip $(SED) --in-place \

178

186

--expression='s/^$Entered-date:$.*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \

179

180

$(SED) --in-place \

187

$@)

188

$(strip $(SED) --in-place \

181

189

--expression='s/$mandos_$[0-9.]\+$\.orig\.tar\.gz$/\1$(version)\2/' \

182

190

$@)

183

191

184

plugins.d/mandos-client: plugins.d/mandos-client.o

185

$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \

186

$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@

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 $@

187

195

188

196

.PHONY : all doc html clean distclean run-client run-server install \

189

197

install-server install-client uninstall uninstall-server \

Older »