/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: 2019-08-01 19:52:59 UTC
  • Revision ID: teddy@recompile.se-20190801195259-nhu15rxjx3wz2kos
Break some long lines and refine documentation

* Makefile (LINUXVERSION): New.
  (LIBDIR): Break long line.
  (SYSTEMD, TMPFILES): Change ":=" to "=" to not run unless required.
  (run-client): Break long lines, and add two more harmless warnings
                to informational message.
  (install-server): Break long line.
  (install-client-nokey): - '' -
  (install-client): Shorten long line by using $(LINUXVERSION).
  (uninstall-client): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
44
44
htmldir:=man
45
 
version:=1.8.6
 
45
version:=1.8.5
46
46
SED:=sed
47
 
PKG_CONFIG?=pkg-config
48
47
 
49
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
50
49
        || getent passwd nobody || echo 65534)))
84
83
        done)
85
84
##
86
85
 
87
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
86
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd \
88
87
                        --variable=systemdsystemunitdir)
89
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
 
                        --variable=tmpfilesdir)
 
88
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
91
89
 
92
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
93
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
94
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
95
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
 
90
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
 
91
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
 
92
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
 
93
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
96
94
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
97
95
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
98
96
        getconf LFS_LDFLAGS)
99
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
100
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
101
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
102
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
97
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
98
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
99
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
 
100
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
103
101
 
104
102
# Do not change these two
105
103
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \