/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: 2009-10-24 19:17:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091024191752-7g6xlf6wpp2pdexb
Convert some programs to use the exit codes from <sysexits.h>.  Change
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.

* plugin-runner.c: Use <sysexits.h> exit codes.  Always use fallback,
                   even on option errors, except for "--help", etc.
  (getplugin): Make sure "errno" is set correctly on return.
  (main): Declare our own "--help", "--usage", and "--version"
          options which do not cause the fallback to be invoked.
          In all other options, use fallback on any error.
  (parse_opt, parse_opt_config_file): Reset errno at start and return
                                      errno.  No need to check "arg"
                                      for NULL.  New "--help",
                                      "--usage", and "--version"
                                      options.
  (parse_opt): Accept empty string as global option.  Do not print
               errors which will be detected and reported later.  Do
               "argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes.  Do not
                             return successful exit code on "--help",
                             etc. since this would give the wrong
                             message to "plugin-runner".
  (main): Declare our own "--help", "--usage", and "--version"
          options which do not return a successful exit code.
  (parse_opt): Reset errno at start and return errno.  Do
               "argp_error()" on parse errors.  New "--help",
               "--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>.  Do
                               not return successful exit code on
                               "--help", etc. since this would give
                               the wrong message to "plugin-runner".
  (main): Declare our own "--help", "--usage", and "--version" options
          which do not return a successful exit code.  Do
          close(STDOUT_FILENO) after writing to check its return code.
  (parse_opt): Reset errno at start and return errno.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
12
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
14
LINK_FORTIFY_LD=-z relro -fPIE
14
15
LINK_FORTIFY=-pie
16
17
OPTIMIZE=-Os
17
18
LANGUAGE=-std=gnu99
18
19
htmldir=man
19
 
version=1.0.3
 
20
version=1.0.13
20
21
SED=sed
21
22
 
22
23
## Use these settings for a traditional /usr/local install
35
36
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
37
##
37
38
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
39
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
40
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
41
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
42
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
43
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
44
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
45
        getconf LFS_LDFLAGS)
44
46
 
45
47
# Do not change these two
46
48
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
77
79
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
80
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
81
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
82
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
83
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
84
        plugins.d/mandos-client.8mandos \
83
85
        plugins.d/password-prompt.8mandos mandos.conf.5 \
151
153
# Update all these files with version number $(version)
152
154
common.ent: Makefile
153
155
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
156
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
155
157
                $@
156
158
 
157
159
mandos: Makefile
164
166
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
167
                $@
166
168
 
167
 
mandos-list: Makefile
 
169
mandos-ctl: Makefile
168
170
        $(SED) --in-place \
169
171
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
172
                $@
213
215
 
214
216
# Run the server with a local config
215
217
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
218
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
217
219
 
218
220
# Used by run-server
219
221
confdir/mandos.conf: mandos.conf
285
287
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
288
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
289
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
290
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
289
291
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
292
        gzip --best --to-stdout mandos-keygen.8 \
291
293
                > $(MANDIR)/man8/mandos-keygen.8.gz
332
334
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
335
                $(INITRAMFSTOOLS)/hooks/mandos \
334
336
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
337
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
336
338
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
339
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
340
                $(MANDIR)/man8/password-prompt.8mandos.gz \