/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 Hogeborn
  • Date: 2011-10-22 00:46:35 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: teddy@recompile.se-20111022004635-3hey47pvet46yccr
* Makefile (run-server): Remove obsolete warning.
* mandos: Clean up and demystify logging.  Add time stamp to console
          debug log messages.
  (AvahiServiceToSyslog): New; only to adjust syslog format.
  (AvahiService.rename): Don't touch syslog logger.
* mandos.xml (BUGS): Remove note about timestamps on console log.

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.0.14
 
26
version=1.4.1
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=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(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 $@))
 
68
        $(MANPOST) $(notdir $@);\
 
69
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
70
        --local-file $(notdir $@) >/dev/null)
69
71
# DocBook-to-man post-processing to fix a '\n' escape bug
70
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
73
 
87
89
        plugins.d/plymouth
88
90
CPROGS=plugin-runner $(PLUGINS)
89
91
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 mandos-ctl.8 \
 
92
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
93
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
92
94
        plugins.d/mandos-client.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
 
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
96
98
 
97
99
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
100
 
119
121
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
122
        $(DOCBOOKTOHTML)
121
123
 
 
124
intro.8mandos: intro.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOMAN)
 
126
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
127
        $(DOCBOOKTOHTML)
 
128
 
122
129
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
130
                legalnotice.xml
124
131
        $(DOCBOOKTOMAN)
210
217
                $@)
211
218
 
212
219
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
220
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
221
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
222
 
216
223
.PHONY : all doc html clean distclean run-client run-server install \
217
224
        install-server install-client uninstall uninstall-server \
253
260
 
254
261
# Run the server with a local config
255
262
run-server: confdir/mandos.conf confdir/clients.conf
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
263
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
263
264
 
264
265
# Used by run-server
300
301
        fi
301
302
        gzip --best --to-stdout mandos.8 \
302
303
                > $(MANDIR)/man8/mandos.8.gz
 
304
        gzip --best --to-stdout mandos-monitor.8 \
 
305
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
306
        gzip --best --to-stdout mandos-ctl.8 \
 
307
                > $(MANDIR)/man8/mandos-ctl.8.gz
303
308
        gzip --best --to-stdout mandos.conf.5 \
304
309
                > $(MANDIR)/man5/mandos.conf.5.gz
305
310
        gzip --best --to-stdout mandos-clients.conf.5 \
346
351
                > $(MANDIR)/man8/mandos-keygen.8.gz
347
352
        gzip --best --to-stdout plugin-runner.8mandos \
348
353
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
354
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
355
                > $(MANDIR)/man8/mandos-client.8mandos.gz
349
356
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
350
357
                > $(MANDIR)/man8/password-prompt.8mandos.gz
351
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
352
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
353
358
        gzip --best --to-stdout plugins.d/usplash.8mandos \
354
359
                > $(MANDIR)/man8/usplash.8mandos.gz
355
360
        gzip --best --to-stdout plugins.d/splashy.8mandos \
356
361
                > $(MANDIR)/man8/splashy.8mandos.gz
357
362
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
358
363
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
364
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
365
                > $(MANDIR)/man8/plymouth.8mandos.gz
359
366
 
360
367
install-client: install-client-nokey
361
368
# Post-installation stuff
370
377
                $(PREFIX)/sbin/mandos-ctl \
371
378
                $(PREFIX)/sbin/mandos-monitor \
372
379
                $(MANDIR)/man8/mandos.8.gz \
 
380
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
381
                $(MANDIR)/man8/mandos-ctl.8.gz \
373
382
                $(MANDIR)/man5/mandos.conf.5.gz \
374
383
                $(MANDIR)/man5/mandos-clients.conf.5.gz
375
384
        update-rc.d -f mandos remove
391
400
                $(INITRAMFSTOOLS)/hooks/mandos \
392
401
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
393
402
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
403
                $(MANDIR)/man8/mandos-keygen.8.gz \
394
404
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
395
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
405
                $(MANDIR)/man8/mandos-client.8mandos.gz
396
406
                $(MANDIR)/man8/password-prompt.8mandos.gz \
397
407
                $(MANDIR)/man8/usplash.8mandos.gz \
398
408
                $(MANDIR)/man8/splashy.8mandos.gz \
399
409
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
400
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
410
                $(MANDIR)/man8/plymouth.8mandos.gz \
401
411
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
402
412
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
403
413
        update-initramfs -k all -u