/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: 2023-02-07 19:29:28 UTC
  • Revision ID: teddy@recompile.se-20230207192928-ueasjbsufb92o6ud
Clarify documentation and a comment about GnuTLS versions

* clients.conf ([foo]/secret): In the comment for the example client's
  "secret" setting, clarify GnuTLS version conditions.
* mandos-clients.conf.xml (OPTIONS/fingerprint, OPTIONS/key_id):
  Clarify required/optional status under different GnuTLS versions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
43
43
LANGUAGE:=-std=gnu11
44
44
FEATURES:=-D_FILE_OFFSET_BITS=64
45
45
htmldir:=man
46
 
version:=1.8.14
 
46
version:=1.8.15
47
47
SED:=sed
48
48
PKG_CONFIG?=pkg-config
49
49
 
96
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
99
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
100
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
99
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
 
100
        || gpgme-config --cflags; getconf LFS_CFLAGS)
 
101
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
 
102
        || gpgme-config --libs; getconf LFS_LIBS; \
101
103
        getconf LFS_LDFLAGS)
102
104
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
105
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
296
298
 
297
299
# Need to add the GLib and pthread libraries
298
300
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
301
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
299
302
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
300
303
 
301
304
.PHONY: clean