summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am4
-rw-r--r--config.mk.in29
-rw-r--r--configure.ac3
-rw-r--r--src/grp-journal/Makefile4
-rw-r--r--src/libfirewall/Makefile4
-rw-r--r--src/libgcrypt/Makefile36
-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
-rwxr-xr-xtools/notsd-move9
9 files changed, 60 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am
index b1c28551a4..1dabbb0819 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4362,8 +4362,10 @@ test_compress_LDADD = \
libsystemd-shared.la
if HAVE_LZ4
+test_compress_CFLAGS += \
+ $(LZ4_CFLAGA)
test_compress_LDADD += \
- -llz4
+ $(LZ4_LIBS)
endif
test_compress_benchmark_SOURCES = \
diff --git a/config.mk.in b/config.mk.in
index 25d338215f..c1859a5cd2 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -108,6 +108,8 @@ libfirewall.CPPFLAGS = -I$(topsrcdir)/src/libfirewall
libfirewall.DEPENDS = $(topoutdir)/src/libfirewall/libfirewall.la
libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared/include $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src
libshared.DEPENDS = $(topoutdir)/src/libshared/src/libshared.la
+libsystemd-shared.CPPFLAGS =
+libsystemd-shared.DEPENDS =
libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS)
libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/src/libsystemd-internal.la
@@ -149,28 +151,28 @@ libnss_resolve.DEPENDS =
# Libraries we use
HAVE_ACL = @HAVE_ACL_TRUE@1
- ACL_CFLAGS = #XXX
+ ACL_CFLAGS =#HARDCODED
ACL_LIBS = @ACL_LIBS@
HAVE_APPARMOR = @HAVE_APPARMOR_TRUE@1
APPARMOR_CFLAGS = @APPARMOR_CFLAGS@
APPARMOR_LIBS = @APPARMOR_LIBS@
HAVE_AUDIT = @HAVE_AUDIT_TRUE@1
- AUDIT_CFLAGS = #XXX
+ AUDIT_CFLAGS =#HARDCODED
AUDIT_LIBS = @AUDIT_LIBS@
HAVE_BLKID = @HAVE_BLKID_TRUE@1
BLKID_CFLAGS = @BLKID_CFLAGS@
BLKID_LIBS = @BLKID_LIBS@
HAVE_BZIP2 = @HAVE_BZIP2_TRUE@1
- BZIP2_CFLAGS = #XXX
- BZIP2_LIBS = -lbz2 #XXX
-HAVE_CAP = 1 #XXX
- CAP_CFLAGS = #XXX
+ BZIP2_CFLAGS =#HARDCODED
+ BZIP2_LIBS = -lbz2#HARDCODED
+HAVE_CAP = 1#HARDCODED
+ CAP_CFLAGS =#HARDCODED
CAP_LIBS = @CAP_LIBS@
HAVE_DBUS = @HAVE_DBUS_TRUE@1
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
HAVE_ELFUTILS = @HAVE_ELFUTILS_TRUE@1
- ELFUTILS_CFLAGS = #XXX
+ ELFUTILS_CFLAGS =#HARDCODED
ELFUTILS_LIBS = @ELFUTILS_LIBS@
HAVE_GCRYPT = @HAVE_GCRYPT_TRUE@1
GCRYPT_CFLAGS = @GCRYPT_CFLAGS@
@@ -178,12 +180,6 @@ HAVE_GCRYPT = @HAVE_GCRYPT_TRUE@1
HAVE_GNUTLS = @HAVE_GNUTLS_TRUE@1
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
-HAVE_GPG_ERROR = 1 #XXX
- GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
- GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
-HAVE_GPG_ERROR_MT = 1 #XXX
- GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
- GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
HAVE_KMOD = @HAVE_KMOD_TRUE@1
KMOD_CFLAGS = @KMOD_CFLAGS@
KMOD_LIBS = @KMOD_LIBS@
@@ -193,9 +189,6 @@ HAVE_LIBCRYPTSETUP = @HAVE_LIBCRYPTSETUP_TRUE@1
HAVE_LIBCURL = @HAVE_LIBCURL_TRUE@1
LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
LIBCURL_LIBS = @LIBCURL_LIBS@
-HAVE_LIBGCRYPT = 1 #XXX
- LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
- LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
HAVE_LIBIDN = @HAVE_LIBIDN_TRUE@1
LIBIDN_CFLAGS = @LIBIDN_CFLAGS@
LIBIDN_LIBS = @LIBIDN_LIBS@
@@ -208,11 +201,11 @@ HAVE_LZ4 = @HAVE_LZ4_TRUE@1
HAVE_MICROHTTPD = @HAVE_MICROHTTPD_TRUE@1
MICROHTTPD_CFLAGS = @MICROHTTPD_CFLAGS@
MICROHTTPD_LIBS = @MICROHTTPD_LIBS@
-HAVE_MOUNT = 1 #XXX
+HAVE_MOUNT = 1#HARDCODED
MOUNT_CFLAGS = @MOUNT_CFLAGS@
MOUNT_LIBS = @MOUNT_LIBS@
HAVE_PAM = @HAVE_PAM_TRUE@1
- PAM_CFLAGS = #XXX
+ PAM_CFLAGS =#HARDCODED
PAM_LIBS = @PAM_LIBS@
HAVE_QRENCODE = @HAVE_QRENCODE_TRUE@1
QRENCODE_CFLAGS = @QRENCODE_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 3ad02ffccf..ffe7b0019c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ SET_ARCH(IA32, i*86*)
SET_ARCH(MIPS, mips*)
SET_ARCH(AARCH64, aarch64*)
-# i18n stuff for the PolicyKit policy files, heck whether intltool can be found, disable NLS otherwise
+# i18n stuff for the PolicyKit policy files, check whether intltool can be found, disable NLS otherwise
AC_CHECK_PROG(intltool_found, [intltool-merge], [yes], [no])
AS_IF([test x"$intltool_found" != xyes],
[AS_IF([test x"$enable_nls" = xyes],
@@ -1653,7 +1653,6 @@ AC_MSG_RESULT([
nss-myhostname: ${have_myhostname}
hwdb: ${enable_hwdb}
tpm: ${have_tpm}
- kdbus: ${have_kdbus}
Python: ${have_python}
man pages: ${have_manpages}
test coverage: ${have_coverage}
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
diff --git a/tools/notsd-move b/tools/notsd-move
index 0e8cc0dd87..5a907109bd 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -697,10 +697,6 @@ breakup_makefile() (
rm .tmp.move.all
sed -ri \
- -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
- -e 's/ \$\(CFLAGS\) / /g' \
- -e 's/ \$\(CPPFLAGS\) / /g' \
- -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \
-e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \
src/libbasic/include/basic/Makefile \
src/libsystemd/src/Makefile \
@@ -745,8 +741,13 @@ breakup_makefile() (
fixup_makefile() {
sed -r \
+ -e '#### Specific complete strings #####' \
+ -e 's|\$\(CPP\)·\$\(CFLAGS\)·\$\(AM_CPPFLAGS\)·\$\(CPPFLAGS\)·|$(CPP) $(sd.ALL_CPPFLAGS) |g' \
+ -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
+ -e '#### General cases #################' \
-e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
-e 's|^if (.*)|ifneq ($(\1),)|' \
+ -e '/\bAM_(C|CPP|LD)FLAGS\b/d' \
-e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-09 19:46:10 +0000