/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

Fixed a bug in fallback handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
14
15
#COVERAGE=--coverage
15
16
OPTIMIZE=-Os
16
17
LANGUAGE=-std=gnu99
17
18
htmldir=man
18
 
version=1.0.2
 
19
version=1.0.5
19
20
SED=sed
20
21
 
21
22
## Use these settings for a traditional /usr/local install
45
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
48
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
50
 
50
51
# Commands to format a DocBook <refentry> document into a manual page
51
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
70
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
72
        $<; $(HTMLPOST) $@
72
73
# Fix citerefentry links
73
 
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'
 
74
HTMLPOST=$(SED) --in-place \
 
75
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
74
76
 
75
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
76
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
77
79
CPROGS=plugin-runner $(PLUGINS)
78
 
PROGS=mandos mandos-keygen $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
79
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
80
82
        plugins.d/mandos-client.8mandos \
81
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
148
150
 
149
151
# Update all these files with version number $(version)
150
152
common.ent: Makefile
151
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
152
156
 
153
157
mandos: Makefile
154
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
158
        $(SED) --in-place \
 
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
160
                $@
155
161
 
156
162
mandos-keygen: Makefile
157
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
163
        $(SED) --in-place \
 
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
165
                $@
 
166
 
 
167
mandos-ctl: Makefile
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
158
171
 
159
172
mandos.lsm: Makefile
160
 
        $(SED) --in-place --expression='s/^\(Version:\).*/\1\t$(version)/' $@
161
 
        $(SED) --in-place --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' $@
 
173
        $(SED) --in-place \
 
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
175
                $@
 
176
        $(SED) --in-place \
 
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
178
                $@
 
179
        $(SED) --in-place \
 
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
181
                $@
162
182
 
163
183
plugins.d/mandos-client: plugins.d/mandos-client.o
164
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
183
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
184
204
        ./plugin-runner --plugin-dir=plugins.d \
185
205
                --config-file=plugin-runner.conf \
186
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
207
                $(CLIENTARGS)
187
208
 
188
209
# Used by run-client
189
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
192
213
 
193
214
# Run the server with a local config
194
215
run-server: confdir/mandos.conf confdir/clients.conf
195
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
196
217
 
197
218
# Used by run-server
198
219
confdir/mandos.conf: mandos.conf
206
227
 
207
228
install: install-server install-client-nokey
208
229
 
209
 
install-html: $(htmldocs)
 
230
install-html: html
210
231
        install --directory $(htmldir)
211
232
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
212
233
                $(htmldocs)