X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=03797d48d4f96ba0cb23056672199bd9741cf115;hp=c03e6fd4713d6c6be735651c9a5181404b52d13a;hb=2da28737c7ecbcc2b7196cf0925e07cd19810840;hpb=5d2803744e2a425ad476737fb3f812833a632f7d diff --git a/Makefile.am b/Makefile.am index c03e6fd47..03797d48d 100644 --- 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_REVISION=0 -LIBELOGIND_AGE=16 +LIBELOGIND_CURRENT=17 +LIBELOGIND_REVISION=2 +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)\" \ @@ -156,22 +154,13 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libelogind/sd-login \ -I $(top_srcdir)/src/libelogind/sd-id128 \ -I $(top_srcdir)/src/update-utmp \ + -I $(top_srcdir)/src/sleep \ $(OUR_CPPFLAGS) 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) @@ -453,15 +442,11 @@ libshared_la_SOURCES = \ src/shared/musl_missing.c \ src/shared/pager.c \ src/shared/pager.h \ + src/shared/sleep-config.c \ + src/shared/sleep-config.h \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h -if HAVE_UTMP -libshared_la_SOURCES += \ - src/shared/utmp-wtmp.c \ - src/update-utmp/update-utmp.c -endif - if HAVE_ACL libshared_la_SOURCES += \ src/shared/acl-util.c \ @@ -478,15 +463,13 @@ libshared_la_LIBADD = \ $(UDEV_LIBS) \ $(ACL_LIBS) -rootlibexec_LTLIBRARIES += \ +noinst_LTLIBRARIES += \ libelogind-shared.la libelogind_shared_la_SOURCES = \ $(libbasic_la_SOURCES) \ $(libshared_la_SOURCES) \ - $(libelogind_internal_la_SOURCES) \ - $(libelogind_journal_internal_la_SOURCES) \ - $(libudev_internal_la_SOURCES) + $(libelogind_internal_la_SOURCES) libelogind_shared_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -511,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 @@ -628,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 @@ -650,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 @@ -682,7 +651,7 @@ header-uninstall-hook: INSTALL_EXEC_HOOKS += header-install-hook UNINSTALL_EXEC_HOOKS += header-uninstall-hook -lib_LTLIBRARIES += \ +rootlib_LTLIBRARIES += \ libelogind.la # ------------------------------------------------------------------------------ @@ -697,6 +666,16 @@ elogind_LDADD = \ libelogind-core.la libelogind_core_la_SOURCES = \ + src/core/cgroup.h \ + src/core/cgroup.c \ + src/core/mount-setup.h \ + src/core/mount-setup.c \ + src/login/elogind.c \ + 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 \ @@ -710,8 +689,6 @@ libelogind_core_la_SOURCES = \ src/login/logind-session.h \ src/login/logind-session-device.c \ src/login/logind-session-device.h \ - src/login/logind-sleep.c \ - src/login/logind-sleep.h \ src/login/logind-user.c \ src/login/logind-user.h \ src/login/logind-inhibit.c \ @@ -722,10 +699,14 @@ libelogind_core_la_SOURCES = \ src/login/logind-user-dbus.c \ src/login/logind-utmp.c \ src/login/logind-acl.h \ - src/core/cgroup.h \ - src/core/cgroup.c \ - src/core/mount-setup.h \ - src/core/mount-setup.c + src/sleep/sleep.c \ + src/sleep/sleep.h + +if HAVE_UTMP +libelogind_core_la_SOURCES += \ + src/shared/utmp-wtmp.c \ + src/update-utmp/update-utmp.c +endif libelogind_core_la_LIBADD = \ libelogind-shared.la @@ -742,6 +723,8 @@ pkglibexec_PROGRAMS += \ elogind loginctl_SOURCES = \ + src/login/eloginctl.c \ + src/login/eloginctl.h \ src/login/loginctl.c \ src/login/sysfs-show.h \ src/login/sysfs-show.c @@ -818,14 +801,16 @@ pam_elogind_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym pam_elogind_la_LIBADD = \ - libelogind-shared.la \ + libshared.la \ $(PAM_LIBS) pamlib_LTLIBRARIES = \ pam_elogind.la +if ENABLE_PAM_CONFIG dist_pamconf_DATA = \ src/login/elogind-user +endif EXTRA_DIST += \ src/login/elogind-user.m4 @@ -1004,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) @@ -1188,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