diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/grp-journal/Makefile | 4 | ||||
| -rw-r--r-- | src/libfirewall/Makefile | 4 | ||||
| -rw-r--r-- | src/libgcrypt/Makefile | 36 | ||||
| -rw-r--r-- | src/libgcrypt/gcrypt-util.c (renamed from src/libshared/src/gcrypt-util.c) | 0 | ||||
| -rw-r--r-- | src/libgcrypt/gcrypt-util.h (renamed from src/libshared/include/shared/gcrypt-util.h) | 0 |
5 files changed, 40 insertions, 4 deletions
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index 4e1aaf7925..d0b2bf1917 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -106,8 +106,10 @@ test_compress_LDADD = \ libsystemd-shared.la ifneq ($(HAVE_LZ4),) +test_compress_CFLAGS += \ + $(LZ4_CFLAGA) test_compress_LDADD += \ - -llz4 + $(LZ4_LIBS) endif test_compress_benchmark_SOURCES = \ diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index 0302964186..4fd3822a6e 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -32,13 +32,11 @@ libfirewall_la_SOURCES = \ src/shared/firewall-util.c libfirewall_la_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBIPTC_CFLAGS) libfirewall_la_LIBADD = \ + libbasic.la \ $(LIBIPTC_LIBS) endif # HAVE_LIBIPTC -sd.CPPFLAGS += $(libbasic.CPPFLAGS) - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libgcrypt/Makefile b/src/libgcrypt/Makefile new file mode 100644 index 0000000000..7184ba255c --- /dev/null +++ b/src/libgcrypt/Makefile @@ -0,0 +1,36 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libgcrypt.la + +libgcrypt_la_SOURCES = \ + src/shared/gcrypt-util.h \ + src/shared/gcrypt-util.c + +libgcrypt_la_LIBADD = \ + libbasic.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/src/gcrypt-util.c b/src/libgcrypt/gcrypt-util.c index 069134a4be..069134a4be 100644 --- a/src/libshared/src/gcrypt-util.c +++ b/src/libgcrypt/gcrypt-util.c diff --git a/src/libshared/include/shared/gcrypt-util.h b/src/libgcrypt/gcrypt-util.h index cf33b3c59c..cf33b3c59c 100644 --- a/src/libshared/include/shared/gcrypt-util.h +++ b/src/libgcrypt/gcrypt-util.h |