/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

Use "getconf" to get correct LFS compile and link flags.

* Makefile (GPGME_CFLAGS): Added output of "getconf LFS_CFLAGS".
  (GPGME_LIBS): Added output of "getconf LFS_LIBS" and
                "getconf LFS_LDFLAGS".
* plugins.d/mandos-client.c: Only define "_LARGEFILE_SOURCE" and
                             "_FILE_OFFSET_BITS" if they are not
                             already defined.

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.12
 
19
version=1.0.6
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 pkg-config --cflags-only-I gnutls)
39
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
152
152
# Update all these files with version number $(version)
153
153
common.ent: Makefile
154
154
        $(SED) --in-place \
155
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
155
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
156
156
                $@
157
157
 
158
158
mandos: Makefile