/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-01-12 22:02:33 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090112220233-lawxo4uvyzb38u1f
* README (The Plugin System): Removed redundant text about options and
                              files for the plugins, this is now
                              documented in the manuals for the
                              plugins.

* plugins.d/mandos-client.c (main): Remove comment which was copied
                                    from another program by mistake.
                                    Use "sscanf" instead of "strtol"
                                    to parse numbers; this uses the
                                    correct type instead of casting.
                                    Don't report errors when removing
                                    temporary directory if directory
                                    is already gone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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://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>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
ifndef BROKEN_PIE
17
 
FORTIFY += -fPIE
18
 
LINK_FORTIFY_LD += -fPIE
19
 
LINK_FORTIFY += -pie
20
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
21
15
#COVERAGE=--coverage
22
16
OPTIMIZE=-Os
23
17
LANGUAGE=-std=gnu99
24
18
htmldir=man
25
 
version=1.0.14
 
19
version=1.0.3
26
20
SED=sed
27
21
 
28
22
## Use these settings for a traditional /usr/local install
41
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
42
36
##
43
37
 
44
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
45
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
46
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
47
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
48
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
49
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
50
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
51
44
 
52
45
# Do not change these two
53
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
84
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
85
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
86
79
CPROGS=plugin-runner $(PLUGINS)
87
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
88
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
89
82
        plugins.d/mandos-client.8mandos \
90
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
158
151
# Update all these files with version number $(version)
159
152
common.ent: Makefile
160
153
        $(SED) --in-place \
161
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
162
155
                $@
163
156
 
164
157
mandos: Makefile
171
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
172
165
                $@
173
166
 
174
 
mandos-ctl: Makefile
 
167
mandos-list: Makefile
175
168
        $(SED) --in-place \
176
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
170
                $@
220
213
 
221
214
# Run the server with a local config
222
215
run-server: confdir/mandos.conf confdir/clients.conf
223
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
224
217
 
225
218
# Used by run-server
226
219
confdir/mandos.conf: mandos.conf
292
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
293
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
294
287
        install initramfs-tools-script \
295
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
296
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
297
290
        gzip --best --to-stdout mandos-keygen.8 \
298
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
339
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
340
333
                $(INITRAMFSTOOLS)/hooks/mandos \
341
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
342
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
343
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
344
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
345
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \