/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

* initramfs-tools-hook: Bug fix: Add "--userid" and "--groupid" to
                        start of "plugin-runner.conf" file instead of
                        appending, to allow any preexisting options to
                        override.
* plugin-runner.conf: Improved wording.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
 
LINK_FORTIFY_LD=-z relro -z now
14
 
LINK_FORTIFY=
15
 
ifndef BROKEN_PIE
16
 
FORTIFY += -fPIE
17
 
LINK_FORTIFY_LD += -fPIE
18
 
LINK_FORTIFY += -pie
19
 
endif
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
20
15
#COVERAGE=--coverage
21
16
OPTIMIZE=-Os
22
17
LANGUAGE=-std=gnu99
23
18
htmldir=man
24
 
version=1.0.14
 
19
version=1.0.8
25
20
SED=sed
26
21
 
27
22
## Use these settings for a traditional /usr/local install
40
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
41
36
##
42
37
 
43
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
44
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
45
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
46
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
47
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)