libsystemd

3 files changed, 94 insertions, 69 deletions

diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index 3b533309a8..523d22cb6b 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -38,10 +38,13 @@ $(outdir)/%.lo: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps
 $(outdir)/.deps:
 	$(AM_V_at)$(MKDIR_P) $@
 
+_systemd.rpath = $(dir $(patsubst $(DESTDIR)%,%,$(filter %/$(@F),$(std.sys_files/$(@D)))))
+_systemd.patsubst-all = $(if $1,$(call _systemd.patsubst-all,$(wordlist 2,$(words $1),$1),$2,$(patsubst $(firstword $1),$2,$3)),$3)
+_systemd.link_files = $(filter %.o %.lo %.la,$^) $(call _systemd.patsubst-all,$(.LIBPATTERNS),-l%,$(filter $(.LIBPATTERNS),$(notdir $^)))
 $(outdir)/%.la:
-	$(AM_V_CCLD)$(LINK) $(filter-out .var%,$^)
+	$(AM_V_CCLD)$(LINK) $(if $(_systemd.rpath),-rpath $(_systemd.rpath)) $(_systemd.link_files)
 
-$(DESTDIR)$(libdir)/%.so: $(outdir)/%.la
+$(DESTDIR)$(libdir)/%.la: $(outdir)/%.la
 	$(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $< $(@D)
 
 $(outdir)/%-from-name.gperf: $(outdir)/%-list.txt
diff --git a/config.mk.in b/config.mk.in
index 9ef65417bf..10862f89b2 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -105,54 +105,91 @@ libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/libsystemd-internal
 libsystemd-internal.DEPENDS  =   $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la
 libsystemd-journal.CPPFLAGS  = -I$(topsrcdir)/src/libsystemd/libsystemd-journal/include
 libsystemd-journal.DEPENDS   =   $(topoutdir)/src/libsystemd/libsystemd-journal/libsystemd-journal.la
-libacl.CPPFLAGS        = 
-libacl.DEPENDS         = @ACL_LIBS@
-libapparmor.CPPFLAGS   = $(shell $(PKG_CONFIG) --cflags libapparmor)
-libapparmor.DEPENDS    = $(shell $(PKG_CONFIG) --libs   libapparmor)
-libaudit.CPPFLAGS      = 
-libaudit.DEPENDS       = @AUDIT_LIBS@
-libblkid.CPPFLAGS      = $(shell $(PKG_CONFIG) --cflags blkid)
-libblkid.DEPENDS       = $(shell $(PKG_CONFIG) --libs   blkid)
-libcap.CPPFLAGS        =
-libcap.DEPENDS         = @CAP_LIBS@
-libcryptsetup.CPPFLAGS = $(shell $(PKG_CONFIG) --cflags libcryptsetup)
-libcryptsetup.DEPENDS  = $(shell $(PKG_CONFIG) --libs   libcryptsetup)
-libcurl.CPPFLAGS       = $(shell $(PKG_CONFIG) --cflags libcurl)
-libcurl.DEPENDS        = $(shell $(PKG_CONFIG) --libs   libcurl)
-libdbus.CPPFLAGS       = $(shell $(PKG_CONFIG) --cflags dbus-1)
-libdbus.DEPENDS        = $(shell $(PKG_CONFIG) --libs   dbus-1)
-libelfutils.CPPFLAGS   = 
-libelfutils.DEPENDS    = @ELFUTILS_LIBS@
-libgcrypt.CPPFLAGS     = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
-libgcrypt.DEPENDS      = $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
-libgnutls.CPPFLAGS     = $(shell $(PKG_CONFIG) --cflags gnutls)
-libgnutls.DEPENDS      = $(shell $(PKG_CONFIG) --libs   gnutls)
-libidn.CPPFLAGS        = $(shell $(PKG_CONFIG) --cflags libidn)
-libidn.DEPENDS         = $(shell $(PKG_CONFIG) --libs   libidn)
-libiptc.CPPFLAGS       = $(shell $(PKG_CONFIG) --cflags libiptc)
-libiptc.DEPENDS        = $(shell $(PKG_CONFIG) --libs   libiptc)
-libkmod.CPPFLAGS       = $(shell $(PKG_CONFIG) --cflags libkmod)
-libkmod.DEPENDS        = $(shell $(PKG_CONFIG) --libs   libkmod)
-liblz4.CPPFLAGS        = $(shell $(PKG_CONFIG) --cflags liblz4)
-liblz4.DEPENDS         = $(shell $(PKG_CONFIG) --libs   liblz4)
-libmicrohttpd.CPPFLAGS = $(shell $(PKG_CONFIG) --cflags libmicrohttpd)
-libmicrohttpd.DEPENDS  = $(shell $(PKG_CONFIG) --libs   libmicrohttpd)
-libmount.CPPFLAGS      = $(shell $(PKG_CONFIG) --cflags mount)
-libmount.DEPENDS       = $(shell $(PKG_CONFIG) --libs   mount)
-libpam.CPPFLAGS        = 
-libpam.DEPENDS         = @PAM_LIBS@
-libqrencode.CPPFLAGS   = $(shell $(PKG_CONFIG) --cflags libqrencode)
-libqrencode.DEPENDS    = $(shell $(PKG_CONFIG) --libs   libqrencode)
-libseccomp.CPPFLAGS    = $(shell $(PKG_CONFIG) --cflags libseccomp)
-libseccomp.DEPENDS     = $(shell $(PKG_CONFIG) --libs   libseccomp)
-libselinux.CPPFLAGS    = $(shell $(PKG_CONFIG) --cflags libselinux)
-libselinux.DEPENDS     = $(shell $(PKG_CONFIG) --libs   libselinux)
-libxkbcommon.CPPFLAGS  = $(shell $(PKG_CONFIG) --cflags xkbcommon)
-libxkbcommon.DEPENDS   = $(shell $(PKG_CONFIG) --libs   xkbcommon)
-libxz.CPPFLAGS         = $(shell $(PKG_CONFIG) --cflags liblzma)
-libxz.DEPENDS          = $(shell $(PKG_CONFIG) --libs   liblzma)
-libz.CPPFLAGS          = $(shell $(PKG_CONFIG) --cflags zlib)
-libz.DEPENDS           = $(shell $(PKG_CONFIG) --libs   zlib)
+
+HAVE_ACL        = @HAVE_ACL_TRUE@1
+     ACL_CFLAGS = #XXX
+     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_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
+     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_LIBS   = @ELFUTILS_LIBS@
+HAVE_GCRYPT        = @HAVE_GCRYPT_TRUE@1
+     GCRYPT_CFLAGS = @GCRYPT_CFLAGS@
+     GCRYPT_LIBS   = @GCRYPT_LIBS@
+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@
+HAVE_LIBCRYPTSETUP        = @HAVE_LIBCRYPTSETUP_TRUE@1
+     LIBCRYPTSETUP_CFLAGS = @LIBCRYPTSETUP_CFLAGS@
+     LIBCRYPTSETUP_LIBS   = @LIBCRYPTSETUP_LIBS@
+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@
+HAVE_LIBIPTC        = @HAVE_LIBIPTC_TRUE@1
+     LIBIPTC_CFLAGS = @LIBIPTC_CFLAGS@
+     LIBIPTC_LIBS   = @LIBIPTC_LIBS@
+HAVE_LZ4        = @HAVE_LZ4_TRUE@1
+     LZ4_CFLAGS = @LZ4_CFLAGS@
+     LZ4_LIBS   = @LZ4_LIBS@
+HAVE_MICROHTTPD        = @HAVE_MICROHTTPD_TRUE@1
+     MICROHTTPD_CFLAGS = @MICROHTTPD_CFLAGS@
+     MICROHTTPD_LIBS   = @MICROHTTPD_LIBS@
+HAVE_MOUNT        = 1 #XXX
+     MOUNT_CFLAGS = @MOUNT_CFLAGS@
+     MOUNT_LIBS   = @MOUNT_LIBS@
+HAVE_PAM        = @HAVE_PAM_TRUE@1
+     PAM_CFLAGS = #XXX
+     PAM_LIBS   = @PAM_LIBS@
+HAVE_QRENCODE        = @HAVE_QRENCODE_TRUE@1
+     QRENCODE_CFLAGS = @QRENCODE_CFLAGS@
+     QRENCODE_LIBS   = @QRENCODE_LIBS@
+HAVE_SECCOMP        = @HAVE_SECCOMP_TRUE@1
+     SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
+     SECCOMP_LIBS   = @SECCOMP_LIBS@
+HAVE_SELINUX        = @HAVE_SELINUX_TRUE@1
+     SELINUX_CFLAGS = @SELINUX_CFLAGS@
+     SELINUX_LIBS   = @SELINUX_LIBS@
+HAVE_XKBCOMMON        = @HAVE_XKBCOMMON_TRUE@1
+     XKBCOMMON_CFLAGS = @XKBCOMMON_CFLAGS@
+     XKBCOMMON_LIBS   = @XKBCOMMON_LIBS@
+HAVE_XZ        = @HAVE_XZ_TRUE@1
+     XZ_CFLAGS = @XZ_CFLAGS@
+     XZ_LIBS   = @XZ_LIBS@
+HAVE_ZLIB        = @HAVE_ZLIB_TRUE@1
+     ZLIB_CFLAGS = @ZLIB_CFLAGS@
+     ZLIB_LIBS   = @ZLIB_LIBS@
 
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 
@@ -193,32 +230,14 @@ ENABLE_TMPFILES = @ENABLE_TMPFILES_TRUE@1
 ENABLE_VCONSOLE = @ENABLE_VCONSOLE_TRUE@1
 ENABLE_ZSH_COMPLETION = @ENABLE_ZSH_COMPLETION_TRUE@1
 
-HAVE_ACL = @HAVE_ACL_TRUE@1
-HAVE_AUDIT = @HAVE_AUDIT_TRUE@1
-HAVE_BLKID = @HAVE_BLKID_TRUE@1
-HAVE_BZIP2 = @HAVE_BZIP2_TRUE@1
 HAVE_COMPRESSION = @HAVE_COMPRESSION_TRUE@1
-HAVE_ELFUTILS = @HAVE_ELFUTILS_TRUE@1
-HAVE_GCRYPT = @HAVE_GCRYPT_TRUE@1
 HAVE_GNUEFI = @HAVE_GNUEFI_TRUE@1
-HAVE_GNUTLS = @HAVE_GNUTLS_TRUE@1
-HAVE_KMOD = @HAVE_KMOD_TRUE@1
-HAVE_LIBCRYPTSETUP = @HAVE_LIBCRYPTSETUP_TRUE@1
-HAVE_LIBCURL = @HAVE_LIBCURL_TRUE@1
-HAVE_LIBIPTC = @HAVE_LIBIPTC_TRUE@1
-HAVE_LZ4 = @HAVE_LZ4_TRUE@1
-HAVE_MICROHTTPD = @HAVE_MICROHTTPD_TRUE@1
 HAVE_MYHOSTNAME = @HAVE_MYHOSTNAME_TRUE@1
-HAVE_PAM = @HAVE_PAM_TRUE@1
 HAVE_PYTHON = @HAVE_PYTHON_TRUE@1
-HAVE_QRENCODE = @HAVE_QRENCODE_TRUE@1
 HAVE_REMOTE = @HAVE_REMOTE_TRUE@1
-HAVE_SECCOMP = @HAVE_SECCOMP_TRUE@1
 HAVE_SMACK = @HAVE_SMACK_TRUE@1
 HAVE_SYSV_COMPAT = @HAVE_SYSV_COMPAT_TRUE@1
 HAVE_UTMP = @HAVE_UTMP_TRUE@1
-HAVE_XZ = @HAVE_XZ_TRUE@1
-HAVE_ZLIB = @HAVE_ZLIB_TRUE@1
 
 LIBTOOLFLAGS = 
 
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index fa6b2db8b7..dcf7cbd798 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -64,7 +64,7 @@ libsystemd_la_CFLAGS = \
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-	-Wl,--version-script=$(@D)/libsystemd.sym
+	-Wl,--version-script=$(srcdir)/libsystemd.sym
 
 libsystemd_la_LIBADD = \
 	$(libsystemd_internal_la_LIBADD) \
@@ -127,6 +127,9 @@ test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
 $(eval $(value automake2autothing))
+$(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym
+$(outdir)/libsystemd.la: $(outdir)/libsystemd-internal/libsystemd-internal.la
+$(outdir)/libsystemd.la: $(outdir)/libsystemd-journal-internal/libsystemd-journal-internal.la
 at.subdirs += libsystemd-internal libsystemd-journal-internal
 #at.subdirs += compat-libs
 include $(topsrcdir)/build-aux/Makefile.tail.mk