/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-02-12 19:08:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090212190835-dqv0piw2u254d0jc
* plugin-runner.c: Whitespace changes only.

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.5
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
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
48
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
49
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
50
44
 
51
45
# Do not change these two
52
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
157
151
# Update all these files with version number $(version)
158
152
common.ent: Makefile
159
153
        $(SED) --in-place \
160
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
161
155
                $@
162
156
 
163
157
mandos: Makefile