/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-09-05 01:05:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090905010525-7qeq05ztwc2ddhuv
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
                                    Bug fix: remove signal handler
                                    before re-raising signal.

* plugins.d/password-prompt.c (main): Check return values from
                                      "sigaddset()".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
16
16
OPTIMIZE=-Os
17
17
LANGUAGE=-std=gnu99
18
18
htmldir=man
19
 
version=1.0.5
 
19
version=1.0.11
20
20
SED=sed
21
21
 
22
22
## Use these settings for a traditional /usr/local install
35
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
36
##
37
37
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
39
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
44
        getconf LFS_LDFLAGS)
44
45
 
45
46
# Do not change these two
46
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
151
152
# Update all these files with version number $(version)
152
153
common.ent: Makefile
153
154
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
155
156
                $@
156
157
 
157
158
mandos: Makefile