summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am42
1 files changed, 7 insertions, 35 deletions
diff --git a/Makefile.am b/Makefile.am
index 946af196f3..e823a5c515 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,6 +157,7 @@ nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
endif
udevlibexec_PROGRAMS =
gperf_gperf_sources =
+rootlib_LTLIBRARIES =
in_files = $(filter %.in,$(EXTRA_DIST))
in_in_files = $(filter %.in.in, $(in_files))
@@ -250,16 +251,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
AM_LDFLAGS = $(OUR_LDFLAGS)
# ------------------------------------------------------------------------------
-define move-to-rootlibdir
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- rm -f $(DESTDIR)$(libdir)/$$libname && \
- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
- mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
- fi
-endef
-
INSTALL_DIRS =
SHUTDOWN_TARGET_WANTS =
@@ -3283,15 +3274,6 @@ libsystemd_la_LIBADD = \
libbasic.la \
libsystemd-journal-internal.la
-libsystemd-install-hook:
- libname=libsystemd.so && $(move-to-rootlibdir)
-
-libsystemd-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
-
pkgconfiglib_DATA += \
src/libsystemd/libsystemd.pc
@@ -3304,7 +3286,7 @@ pkginclude_HEADERS += \
src/systemd/sd-id128.h \
src/systemd/sd-daemon.h
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
libsystemd.la
tests += \
@@ -3636,7 +3618,7 @@ tests += \
include_HEADERS += \
src/libudev/libudev.h
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
libudev.la
libudev_la_SOURCES =\
@@ -3668,16 +3650,6 @@ pkgconfiglib_DATA += \
EXTRA_DIST += \
src/libudev/libudev.pc.in
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libudev-install-hook:
- libname=libudev.so && $(move-to-rootlibdir)
-
-libudev-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
-
-INSTALL_EXEC_HOOKS += libudev-install-hook
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
-
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libudev-internal.la
@@ -5056,7 +5028,7 @@ libnss_systemd_la_LIBADD = \
libsystemd-internal.la \
libbasic.la
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
libnss_systemd.la
# ------------------------------------------------------------------------------
@@ -5078,7 +5050,7 @@ libnss_myhostname_la_LIBADD = \
libsystemd-internal.la \
libbasic.la
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
libnss_myhostname.la
endif
@@ -5177,7 +5149,7 @@ libnss_mymachines_la_LIBADD = \
libsystemd-internal.la \
libbasic.la
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
libnss_mymachines.la
endif
@@ -5476,7 +5448,7 @@ libnss_resolve_la_LIBADD = \
libbasic.la \
-ldl
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
libnss_resolve.la
systemd_resolve_SOURCES = \