/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

Merge fix for password-prompt/plymouth conflict from Björn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.4.1
 
26
version=1.2.3
27
27
SED=sed
28
28
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
59
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
56
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
58
 
64
59
# Commands to format a DocBook <refentry> document into a manual page
65
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
65
        --param man.authors.section.enabled     0 \
71
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
76
69
# DocBook-to-man post-processing to fix a '\n' escape bug
77
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
71
 
99
92
        plugins.d/mandos-client.8mandos \
100
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
101
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
102
 
        plugins.d/plymouth.8mandos intro.8mandos
 
95
        plugins.d/plymouth.8mandos
103
96
 
104
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
98
 
126
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
120
        $(DOCBOOKTOHTML)
128
121
 
129
 
intro.8mandos: intro.xml common.ent legalnotice.xml
130
 
        $(DOCBOOKTOMAN)
131
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
123
                legalnotice.xml
136
124
        $(DOCBOOKTOMAN)
222
210
                $@)
223
211
 
224
212
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
213
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
214
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
215
 
228
216
.PHONY : all doc html clean distclean run-client run-server install \
229
217
        install-server install-client uninstall uninstall-server \
235
223
distclean: clean
236
224
mostlyclean: clean
237
225
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
226
        -rm --force --recursive keydir confdir
239
227
 
240
228
check:  all
241
229
        ./mandos --check
255
243
        @echo "###################################################################"
256
244
        ./plugin-runner --plugin-dir=plugins.d \
257
245
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
259
247
                $(CLIENTARGS)
260
248
 
261
249
# Used by run-client
265
253
 
266
254
# Run the server with a local config
267
255
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
256
        @echo "#################################################################"
 
257
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
258
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
259
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
260
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
261
        @echo "#################################################################"
 
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
263
 
271
264
# Used by run-server
272
265
confdir/mandos.conf: mandos.conf
277
270
        install --mode=u=rw $< $@
278
271
# Add a client password
279
272
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
273
 
283
274
install: install-server install-client-nokey
284
275
 
289
280
 
290
281
install-server: doc
291
282
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
283
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
295
284
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
296
285
                mandos-ctl
328
317
                install --mode=u=rwx \
329
318
                        --directory "$(CONFDIR)/plugins.d"; \
330
319
        fi
331
 
        install --mode=u=rwx,go=rx --directory \
332
 
                "$(CONFDIR)/network-hooks.d"
333
320
        install --mode=u=rwx,go=rx \
334
321
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
335
322
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \