/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: 2015-06-28 16:35:27 UTC
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: teddy@recompile.se-20150628163527-cky0ec59zew7teua
Add a plugin helper directory, available to all plugins.

* Makefile (PLUGIN_HELPERS): New; list of plugin helpers.
  (CPROGS): Appended "$(PLUGIN_HELPERS)".
* initramfs-tools-hook: Create new plugin helper directory, and copy
                        plugin helpers provided by the system and/or
                        by the local administrator.
  (PLUGINHELPERDIR): New.
* plugin-runner.c: Take new --plugin-helper-dir option and provide
                   environment variable to all plugins.
  (PHDIR): New; set to "/lib/mandos/plugin-helpers".
  (main/pluginhelperdir): New.
  (main/options): New option "--plugin-helper-dir".
  (main/parse_opt, main/parse_opt_config_file): Accept new option.
  (main): Use new option to set MANDOSPLUGINHELPERDIR environment
          variable as if using --global-env MANDOSPLUGINHELPERDIR=...
* plugin-runner.xml: Document new --plugin-helper-dir option.
  (SYNOPSIS, OPTIONS): Add "--plugin-helper-dir" option.
  (PLUGINS/WRITING PLUGINS): Document new environment variable
                             available to plugins.
  (ENVIRONMENT): Document new environment variable
                 "MANDOSPLUGINHELPERDIR" affected by the new
                 --plugin-helper-dir option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
24
24
endif
25
25
#COVERAGE=--coverage
26
26
OPTIMIZE=-Os -fno-strict-aliasing
27
 
LANGUAGE=-std=gnu11
 
27
LANGUAGE=-std=gnu99
28
28
htmldir=man
29
29
version=1.6.9
30
30
SED=sed
69
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
71
        getconf LFS_LDFLAGS)
72
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
73
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
74
72
 
75
73
# Do not change these two
76
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
108
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
109
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
110
108
        plugins.d/plymouth
111
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
109
PLUGIN_HELPERS=
112
110
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
113
111
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
114
112
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
242
240
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
243
241
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
244
242
 
245
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
246
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
247
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
248
 
 
249
243
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
250
244
        check run-client run-server install install-html \
251
245
        install-server install-client-nokey install-client uninstall \
360
354
install-client-nokey: all doc
361
355
        install --directory $(LIBDIR)/mandos $(CONFDIR)
362
356
        install --directory --mode=u=rwx $(KEYDIR) \
363
 
                $(LIBDIR)/mandos/plugins.d \
364
 
                $(LIBDIR)/mandos/plugin-helpers
 
357
                $(LIBDIR)/mandos/plugins.d
365
358
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
366
359
                install --mode=u=rwx \
367
360
                        --directory "$(CONFDIR)/plugins.d"; \
391
384
        install --mode=u=rwxs,go=rx \
392
385
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
386
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
 
                plugin-helpers/mandos-client-iprouteadddel
397
387
        install initramfs-tools-hook \
398
388
                $(INITRAMFSTOOLS)/hooks/mandos
399
389
        install --mode=u=rw,go=r initramfs-tools-hook-conf \