/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

  • Committer: Teddy Hogeborn
  • Date: 2019-11-21 19:30:47 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20191121193047-nszsowvqcvk081p2
Makefile: Use target-specific variables

Instead of overriding a whole rule and invoking $(LINK.c) explicitly
for certain targets (in order to append special compilation flags),
set CFLAGS and LDLIBS as target-specific variables on those targets.

* Makefile (plugins.d/mandos-client): Replace with a target-specific
  variable setting.
  (plugin-helpers/mandos-client-iprouteadddel): - ''-
  (dracut-module/password-agent): - '' -

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:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
34
33
LINK_FORTIFY_LD:=-z relro -z now
35
34
LINK_FORTIFY:=
36
35
 
42
41
#COVERAGE=--coverage
43
42
OPTIMIZE:=-Os -fno-strict-aliasing
44
43
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
46
45
htmldir:=man
47
 
version:=1.8.16
 
46
version:=1.8.9
48
47
SED:=sed
49
48
PKG_CONFIG?=pkg-config
50
49
 
64
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
65
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
68
66
##
69
67
 
70
68
## These settings are for a package-type install
85
83
                        break; \
86
84
                fi; \
87
85
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
86
##
90
87
 
91
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
99
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
102
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
103
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
104
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
105
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
106
101
        getconf LFS_LDFLAGS)
107
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
111
106
 
112
107
# Do not change these two
113
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
115
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
112
 
161
156
 
162
157
objects:=$(addsuffix .o,$(CPROGS))
163
158
 
164
 
.PHONY: all
165
159
all: $(PROGS) mandos.lsm
166
160
 
167
 
.PHONY: doc
168
161
doc: $(DOCS)
169
162
 
170
 
.PHONY: html
171
163
html: $(htmldocs)
172
164
 
173
165
%.5: %.xml common.ent legalnotice.xml
301
293
 
302
294
# Need to add the GLib and pthread libraries
303
295
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
304
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
305
296
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
306
297
 
307
 
.PHONY: clean
 
298
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
299
        check run-client run-server install install-html \
 
300
        install-server install-client-nokey install-client uninstall \
 
301
        uninstall-server uninstall-client purge purge-server \
 
302
        purge-client
 
303
 
308
304
clean:
309
305
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
310
306
 
311
 
.PHONY: distclean
312
307
distclean: clean
313
 
.PHONY: mostlyclean
314
308
mostlyclean: clean
315
 
.PHONY: maintainer-clean
316
309
maintainer-clean: clean
317
310
        -rm --force --recursive keydir confdir statedir
318
311
 
319
 
.PHONY: check
320
312
check: all
321
313
        ./mandos --check
322
314
        ./mandos-ctl --check
326
318
        ./dracut-module/password-agent --test
327
319
 
328
320
# Run the client with a local config and key
329
 
.PHONY: run-client
330
321
run-client: all keydir/seckey.txt keydir/pubkey.txt \
331
322
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
332
323
        @echo '######################################################'
360
351
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
361
352
        install --directory keydir
362
353
        ./mandos-keygen --dir keydir --force
363
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
364
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
365
 
        fi
366
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
367
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
368
 
        fi
369
354
 
370
355
# Run the server with a local config
371
 
.PHONY: run-server
372
356
run-server: confdir/mandos.conf confdir/clients.conf statedir
373
357
        ./mandos --debug --no-dbus --configdir=confdir \
374
358
                --statedir=statedir $(SERVERARGS)
385
369
statedir:
386
370
        install --directory statedir
387
371
 
388
 
.PHONY: install
389
372
install: install-server install-client-nokey
390
373
 
391
 
.PHONY: install-html
392
374
install-html: html
393
375
        install --directory $(htmldir)
394
376
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
395
377
                $(htmldocs)
396
378
 
397
 
.PHONY: install-server
398
379
install-server: doc
399
380
        install --directory $(CONFDIR)
400
381
        if install --directory --mode=u=rwx --owner=$(USER) \
423
404
        install --mode=u=rw --target-directory=$(CONFDIR) \
424
405
                clients.conf
425
406
        install --mode=u=rw,go=r dbus-mandos.conf \
426
 
                $(DBUSPOLICYDIR)/mandos.conf
 
407
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
427
408
        install --mode=u=rwx,go=rx init.d-mandos \
428
409
                $(DESTDIR)/etc/init.d/mandos
429
410
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
447
428
        gzip --best --to-stdout intro.8mandos \
448
429
                > $(MANDIR)/man8/intro.8mandos.gz
449
430
 
450
 
.PHONY: install-client-nokey
451
431
install-client-nokey: all doc
452
432
        install --directory $(LIBDIR)/mandos $(CONFDIR)
453
433
        install --directory --mode=u=rwx $(KEYDIR) \
532
512
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
533
513
                > $(MANDIR)/man8/password-agent.8mandos.gz
534
514
 
535
 
.PHONY: install-client
536
515
install-client: install-client-nokey
537
516
# Post-installation stuff
538
517
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
548
527
        fi
549
528
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
550
529
 
551
 
.PHONY: uninstall
552
530
uninstall: uninstall-server uninstall-client
553
531
 
554
 
.PHONY: uninstall-server
555
532
uninstall-server:
556
533
        -rm --force $(PREFIX)/sbin/mandos \
557
534
                $(PREFIX)/sbin/mandos-ctl \
564
541
        update-rc.d -f mandos remove
565
542
        -rmdir $(CONFDIR)
566
543
 
567
 
.PHONY: uninstall-client
568
544
uninstall-client:
569
545
# Refuse to uninstall client if /etc/crypttab is explicitly configured
570
546
# to use it.
606
582
            done; \
607
583
        fi
608
584
 
609
 
.PHONY: purge
610
585
purge: purge-server purge-client
611
586
 
612
 
.PHONY: purge-server
613
587
purge-server: uninstall-server
614
588
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
615
589
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
620
594
                $(DESTDIR)/var/run/mandos.pid
621
595
        -rmdir $(CONFDIR)
622
596
 
623
 
.PHONY: purge-client
624
597
purge-client: uninstall-client
625
598
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
626
599
        -rm --force $(CONFDIR)/plugin-runner.conf \