/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

  • Committer: teddy at bsnet
  • Date: 2010-09-15 17:21:04 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100915172104-eopud55s7dc6vkfj
* plugins.d/usplash.c (main): BUG FIX: allocate space for the final
                              NULL in cmdline_argv.

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.0.14
27
27
SED=sed
28
28
 
29
29
## Use these settings for a traditional /usr/local install
54
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
56
        -DVERSION='"$(version)"'
57
 
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))
58
58
 
59
59
# Commands to format a DocBook <refentry> document into a manual page
60
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
65
65
        --param man.authors.section.enabled     0 \
66
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
67
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
71
69
# DocBook-to-man post-processing to fix a '\n' escape bug
72
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
71
 
89
87
        plugins.d/plymouth
90
88
CPROGS=plugin-runner $(PLUGINS)
91
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
91
        mandos-monitor.8 \
94
92
        plugins.d/mandos-client.8mandos \
95
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
96
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
97
 
        plugins.d/plymouth.8mandos intro.8mandos
 
93
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
94
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
95
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
98
96
 
99
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
100
98
 
121
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
122
120
        $(DOCBOOKTOHTML)
123
121
 
124
 
intro.8mandos: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOMAN)
126
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
130
123
                legalnotice.xml
131
124
        $(DOCBOOKTOMAN)
147
140
                 legalnotice.xml
148
141
        $(DOCBOOKTOHTML)
149
142
 
150
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
143
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
158
144
                legalnotice.xml
159
145
        $(DOCBOOKTOMAN)
217
203
                $@)
218
204
 
219
205
plugins.d/mandos-client: plugins.d/mandos-client.c
220
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
206
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
207
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
222
208
 
223
209
.PHONY : all doc html clean distclean run-client run-server install \
224
210
        install-server install-client uninstall uninstall-server \
260
246
 
261
247
# Run the server with a local config
262
248
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        ./mandos --debug --no-dbus --configdir=confdir --no-restore \
264
 
        $(SERVERARGS)
 
249
        @echo "#################################################################"
 
250
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
251
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
252
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
253
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
254
        @echo "#################################################################"
 
255
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
265
256
 
266
257
# Used by run-server
267
258
confdir/mandos.conf: mandos.conf
302
293
        fi
303
294
        gzip --best --to-stdout mandos.8 \
304
295
                > $(MANDIR)/man8/mandos.8.gz
305
 
        gzip --best --to-stdout mandos-monitor.8 \
306
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
307
 
        gzip --best --to-stdout mandos-ctl.8 \
308
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
309
296
        gzip --best --to-stdout mandos.conf.5 \
310
297
                > $(MANDIR)/man5/mandos.conf.5.gz
311
298
        gzip --best --to-stdout mandos-clients.conf.5 \
352
339
                > $(MANDIR)/man8/mandos-keygen.8.gz
353
340
        gzip --best --to-stdout plugin-runner.8mandos \
354
341
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
342
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
343
                > $(MANDIR)/man8/password-prompt.8mandos.gz
355
344
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
356
345
                > $(MANDIR)/man8/mandos-client.8mandos.gz
357
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
358
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
359
346
        gzip --best --to-stdout plugins.d/usplash.8mandos \
360
347
                > $(MANDIR)/man8/usplash.8mandos.gz
361
348
        gzip --best --to-stdout plugins.d/splashy.8mandos \
362
349
                > $(MANDIR)/man8/splashy.8mandos.gz
363
350
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
364
351
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
365
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
366
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
367
352
 
368
353
install-client: install-client-nokey
369
354
# Post-installation stuff
378
363
                $(PREFIX)/sbin/mandos-ctl \
379
364
                $(PREFIX)/sbin/mandos-monitor \
380
365
                $(MANDIR)/man8/mandos.8.gz \
381
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
382
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
383
366
                $(MANDIR)/man5/mandos.conf.5.gz \
384
367
                $(MANDIR)/man5/mandos-clients.conf.5.gz
385
368
        update-rc.d -f mandos remove
401
384
                $(INITRAMFSTOOLS)/hooks/mandos \
402
385
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
403
386
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
387
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
404
388
                $(MANDIR)/man8/mandos-keygen.8.gz \
405
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
406
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
407
389
                $(MANDIR)/man8/password-prompt.8mandos.gz \
408
390
                $(MANDIR)/man8/usplash.8mandos.gz \
409
391
                $(MANDIR)/man8/splashy.8mandos.gz \
410
392
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
411
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
393
                $(MANDIR)/man8/mandos-client.8mandos.gz
412
394
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
413
395
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
414
396
        update-initramfs -k all -u