fs-util: change chase_symlinks() behaviour in regards to escaping the root dir

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 20ed1324dbc45b7ac0f042137cd1e974dddad16b..03797d48d4f96ba0cb23056672199bd9741cf115 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=16
+LIBELOGIND_CURRENT=17
 LIBELOGIND_REVISION=2
-LIBELOGIND_AGE=16
+LIBELOGIND_AGE=17
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -76,14 +76,11 @@ EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
-INSTALL_DATA_HOOKS =
-UNINSTALL_DATA_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 CLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
-rootlibexec_LTLIBRARIES =
 noinst_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
@@ -97,6 +94,7 @@ dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
 dist_rootlibexec_DATA =
+rootlib_LTLIBRARIES =
 tests=
 manual_tests =
 if ENABLE_TESTS
@@ -124,13 +122,13 @@ CLEANFILES = $(BUILT_SOURCES) \
        $(m4_files:.m4=)
 
 .PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \
-       $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
        $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+       -DSYSTEMD_CGROUP_CONTROLLER=\"_$(CGROUP_CONTROLLER)\" \
+       -DSYSTEMD_CGROUP_CONTROLLER_LEGACY=\"name=$(CGROUP_CONTROLLER)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
@@ -163,16 +161,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-touch-usr-hook:
        touch -c $(DESTDIR)/$(prefix)
 
@@ -475,7 +463,7 @@ libshared_la_LIBADD = \
        $(UDEV_LIBS) \
        $(ACL_LIBS)
 
-rootlibexec_LTLIBRARIES += \
+noinst_LTLIBRARIES += \
        libelogind-shared.la
 
 libelogind_shared_la_SOURCES = \
@@ -506,9 +494,7 @@ libelogind_shared_la_LIBADD = \
        $(SECCOMP_LIBS)
 
 libelogind_shared_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -release $(PACKAGE_VERSION)
-
+       $(AM_LDFLAGS)
  # -----------------------------------------------------------------------------
 gperf_txt_sources = \
        src/basic/errno-list.txt
@@ -623,9 +609,6 @@ libelogind_internal_la_SOURCES = \
        src/libelogind/sd-daemon/sd-daemon.c \
        src/libelogind/sd-login/sd-login.c
 
-libelogind_internal_la_LIBADD = \
-       -lresolv
-
 noinst_LTLIBRARIES += \
        libelogind-internal.la
 
@@ -645,15 +628,6 @@ libelogind_la_LIBADD = \
        libelogind-internal.la \
        libbasic.la
 
-libelogind-install-hook:
-       libname=libelogind.so && $(move-to-rootlibdir)
-
-libelogind-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
-
-INSTALL_EXEC_HOOKS += libelogind-install-hook
-UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
-
 pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
@@ -677,7 +651,7 @@ header-uninstall-hook:
 INSTALL_EXEC_HOOKS += header-install-hook
 UNINSTALL_EXEC_HOOKS += header-uninstall-hook
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
        libelogind.la
 
 # ------------------------------------------------------------------------------
@@ -700,6 +674,8 @@ libelogind_core_la_SOURCES = \
         src/login/elogind.h \
         src/login/elogind-action.c \
         src/login/elogind-action.h \
+       src/login/elogind-dbus.c \
+       src/login/elogind-dbus.h \
        src/login/logind-core.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
@@ -831,8 +807,10 @@ pam_elogind_la_LIBADD = \
 pamlib_LTLIBRARIES = \
        pam_elogind.la
 
+if ENABLE_PAM_CONFIG
 dist_pamconf_DATA = \
        src/login/elogind-user
+endif
 
 EXTRA_DIST += \
        src/login/elogind-user.m4
@@ -1011,9 +989,7 @@ EXTRA_DIST += \
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
-
-install-data-hook: $(INSTALL_DATA_HOOKS)
+uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
@@ -1195,7 +1171,7 @@ print-%:
        @echo $($*)
 
 git-contrib:
-       @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+       @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | sed 's/ / /g' | awk '{ print $$0 "," }' | sort -u
 
 EXTRA_DIST += \
         tools/gdb-sd_dump_hashmaps.py