/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

* plugin-runner.c: Whitespace changes only.

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://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>.
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
13
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
13
LINK_FORTIFY_LD=-z relro -fPIE
15
14
LINK_FORTIFY=-pie
17
16
OPTIMIZE=-Os
18
17
LANGUAGE=-std=gnu99
19
18
htmldir=man
20
 
version=1.0.12
 
19
version=1.0.5
21
20
SED=sed
22
21
 
23
22
## Use these settings for a traditional /usr/local install
36
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
37
36
##
38
37
 
39
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
40
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
41
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
42
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
43
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
44
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
45
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
46
44
 
47
45
# Do not change these two
48
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
153
151
# Update all these files with version number $(version)
154
152
common.ent: Makefile
155
153
        $(SED) --in-place \
156
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
157
155
                $@
158
156
 
159
157
mandos: Makefile