/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

* plugins.d/password-prompt.c: Use environment variables and prompt
                               text from cryptsetup 1.1.
* plugins.d/password-prompt.xml (ENVIRONMENT): Document change in
                                               environment variables
                                               used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
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
15
21
#COVERAGE=--coverage
16
22
OPTIMIZE=-Os
17
23
LANGUAGE=-std=gnu99
18
24
htmldir=man
19
 
version=1.0.6
 
25
version=1.0.14
20
26
SED=sed
21
27
 
22
28
## Use these settings for a traditional /usr/local install
35
41
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
42
##
37
43
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
44
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
45
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
46
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
47
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
48
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
152
158
# Update all these files with version number $(version)
153
159
common.ent: Makefile
154
160
        $(SED) --in-place \
155
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
161
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
156
162
                $@
157
163
 
158
164
mandos: Makefile