/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: 2018-02-22 18:15:57 UTC
  • Revision ID: teddy@recompile.se-20180222181557-yhp7z2pgx9y9nf4b
Mark fallthrough case with comment

* plugin-runner.c (main/parse_opt): Mark case ARGP_KEY_ARG as falling
  through (in the case where the argument is not empty).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
40
40
OPTIMIZE:=-Os -fno-strict-aliasing
41
41
LANGUAGE:=-std=gnu11
42
42
htmldir:=man
43
 
version:=1.7.19
 
43
version:=1.7.18
44
44
SED:=sed
45
45
 
46
46
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
89
89
 
90
90
# Do not change these two
91
91
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
92
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
93
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
93
94
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
94
95
 
95
96
# Commands to format a DocBook <refentry> document into a manual page
256
257
# -fsanitize=leak because GnuTLS and GPGME both leak memory.
257
258
plugins.d/mandos-client: plugins.d/mandos-client.c
258
259
        $(CC) $(filter-out -fsanitize=leak,$(CFLAGS)) $(strip\
259
 
        ) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) $(strip\
260
260
                ) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(strip\
261
261
                ) -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
262
262
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
396
396
                "$(CONFDIR)/network-hooks.d"
397
397
        install --mode=u=rwx,go=rx \
398
398
                --target-directory=$(LIBDIR)/mandos plugin-runner
399
 
        install --mode=u=rwx,go=rx \
400
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
401
399
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
402
400
                mandos-keygen
403
401
        install --mode=u=rwx,go=rx \
423
421
                plugin-helpers/mandos-client-iprouteadddel
424
422
        install initramfs-tools-hook \
425
423
                $(INITRAMFSTOOLS)/hooks/mandos
426
 
        install --mode=u=rw,go=r initramfs-tools-conf \
427
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
424
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
425
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
428
426
        install initramfs-tools-script \
429
427
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
430
 
        install initramfs-tools-script-stop \
431
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
432
428
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
433
429
        gzip --best --to-stdout mandos-keygen.8 \
434
430
                > $(MANDIR)/man8/mandos-keygen.8.gz