/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: 2022-04-24 12:16:29 UTC
  • Revision ID: teddy@recompile.se-20220424121629-rsabsoen8cjmsscd
mandos: Update logging code to more standard idioms

* mandos-monitor: Get logger using basename instead of full command.
  Also, eliminate last uses of .format() when logging.
  (logger): Rename to "log".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
29
29
 
30
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
32
FORTIFY:=-D_FORTIFY_SOURCE=3 -fstack-protector-all -fPIC
33
33
LINK_FORTIFY_LD:=-z relro -z now
34
34
LINK_FORTIFY:=
35
35
 
43
43
LANGUAGE:=-std=gnu11
44
44
FEATURES:=-D_FILE_OFFSET_BITS=64
45
45
htmldir:=man
46
 
version:=1.8.7
 
46
version:=1.8.14
47
47
SED:=sed
48
48
PKG_CONFIG?=pkg-config
49
49
 
156
156
 
157
157
objects:=$(addsuffix .o,$(CPROGS))
158
158
 
 
159
.PHONY: all
159
160
all: $(PROGS) mandos.lsm
160
161
 
 
162
.PHONY: doc
161
163
doc: $(DOCS)
162
164
 
 
165
.PHONY: html
163
166
html: $(htmldocs)
164
167
 
165
168
%.5: %.xml common.ent legalnotice.xml
282
285
                $@)
283
286
 
284
287
# Need to add the GnuTLS, Avahi and GPGME libraries
285
 
plugins.d/mandos-client: plugins.d/mandos-client.c
286
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
287
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
288
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
289
 
                ) $(LDLIBS) -o $@
 
288
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
 
289
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
290
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
 
291
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
290
292
 
291
293
# Need to add the libnl-route library
292
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
293
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
294
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
294
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
295
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
295
296
 
296
297
# Need to add the GLib and pthread libraries
297
 
dracut-module/password-agent: dracut-module/password-agent.c
298
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
299
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
300
 
 
301
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
302
 
        check run-client run-server install install-html \
303
 
        install-server install-client-nokey install-client uninstall \
304
 
        uninstall-server uninstall-client purge purge-server \
305
 
        purge-client
306
 
 
 
298
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
299
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
 
300
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
301
 
 
302
.PHONY: clean
307
303
clean:
308
304
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
309
305
 
 
306
.PHONY: distclean
310
307
distclean: clean
 
308
.PHONY: mostlyclean
311
309
mostlyclean: clean
 
310
.PHONY: maintainer-clean
312
311
maintainer-clean: clean
313
312
        -rm --force --recursive keydir confdir statedir
314
313
 
 
314
.PHONY: check
315
315
check: all
316
316
        ./mandos --check
317
317
        ./mandos-ctl --check
321
321
        ./dracut-module/password-agent --test
322
322
 
323
323
# Run the client with a local config and key
 
324
.PHONY: run-client
324
325
run-client: all keydir/seckey.txt keydir/pubkey.txt \
325
326
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
326
327
        @echo '######################################################'
354
355
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
355
356
        install --directory keydir
356
357
        ./mandos-keygen --dir keydir --force
 
358
        if ! [ -e keydir/tls-privkey.pem ]; then \
 
359
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
 
360
        fi
 
361
        if ! [ -e keydir/tls-pubkey.pem ]; then \
 
362
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
 
363
        fi
357
364
 
358
365
# Run the server with a local config
 
366
.PHONY: run-server
359
367
run-server: confdir/mandos.conf confdir/clients.conf statedir
360
368
        ./mandos --debug --no-dbus --configdir=confdir \
361
369
                --statedir=statedir $(SERVERARGS)
372
380
statedir:
373
381
        install --directory statedir
374
382
 
 
383
.PHONY: install
375
384
install: install-server install-client-nokey
376
385
 
 
386
.PHONY: install-html
377
387
install-html: html
378
388
        install --directory $(htmldir)
379
389
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
380
390
                $(htmldocs)
381
391
 
 
392
.PHONY: install-server
382
393
install-server: doc
383
394
        install --directory $(CONFDIR)
384
395
        if install --directory --mode=u=rwx --owner=$(USER) \
431
442
        gzip --best --to-stdout intro.8mandos \
432
443
                > $(MANDIR)/man8/intro.8mandos.gz
433
444
 
 
445
.PHONY: install-client-nokey
434
446
install-client-nokey: all doc
435
447
        install --directory $(LIBDIR)/mandos $(CONFDIR)
436
448
        install --directory --mode=u=rwx $(KEYDIR) \
515
527
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
516
528
                > $(MANDIR)/man8/password-agent.8mandos.gz
517
529
 
 
530
.PHONY: install-client
518
531
install-client: install-client-nokey
519
532
# Post-installation stuff
520
533
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
530
543
        fi
531
544
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
532
545
 
 
546
.PHONY: uninstall
533
547
uninstall: uninstall-server uninstall-client
534
548
 
 
549
.PHONY: uninstall-server
535
550
uninstall-server:
536
551
        -rm --force $(PREFIX)/sbin/mandos \
537
552
                $(PREFIX)/sbin/mandos-ctl \
544
559
        update-rc.d -f mandos remove
545
560
        -rmdir $(CONFDIR)
546
561
 
 
562
.PHONY: uninstall-client
547
563
uninstall-client:
548
564
# Refuse to uninstall client if /etc/crypttab is explicitly configured
549
565
# to use it.
585
601
            done; \
586
602
        fi
587
603
 
 
604
.PHONY: purge
588
605
purge: purge-server purge-client
589
606
 
 
607
.PHONY: purge-server
590
608
purge-server: uninstall-server
591
609
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
592
610
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
597
615
                $(DESTDIR)/var/run/mandos.pid
598
616
        -rmdir $(CONFDIR)
599
617
 
 
618
.PHONY: purge-client
600
619
purge-client: uninstall-client
601
620
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
602
621
        -rm --force $(CONFDIR)/plugin-runner.conf \