X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=69a274f61d68b513d95136c0c3deac6d058ad58f;hb=cb7968de9b62d0210c8212f92d932930f99a7a0c;hp=1e1870c8106e90d299a240d23311861b00e0fd06;hpb=35eec258c4523c92fe985d764198b266ebc3881a;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 1e1870c81..69a274f61 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=3 -LIBELOGIND_AGE=16 +LIBELOGIND_CURRENT=18 +LIBELOGIND_REVISION=1 +LIBELOGIND_AGE=18 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -50,6 +50,8 @@ pamconfdir=@pamconfdir@ pkgconfigdatadir=$(datadir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig polkitpolicydir=$(datadir)/polkit-1/actions +polkitrulesdir=$(datadir)/polkit-1/rules.d +polkitpkladir=$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d bashcompletiondir=@bashcompletiondir@ zshcompletiondir=@zshcompletiondir@ @@ -76,8 +78,6 @@ EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = -INSTALL_DATA_HOOKS = -UNINSTALL_DATA_HOOKS = DISTCLEAN_LOCAL_HOOKS = CLEAN_LOCAL_HOOKS = pkginclude_HEADERS = @@ -87,6 +87,8 @@ noinst_DATA = pkgconfiglib_DATA = polkitpolicy_in_files = polkitpolicy_files = +polkitrules_files = +polkitpkla_files = dist_udevrules_DATA = nodist_udevrules_DATA = dist_pkgsysconf_DATA = @@ -96,6 +98,7 @@ dist_dbussystemservice_DATA = check_PROGRAMS = check_DATA = dist_rootlibexec_DATA = +rootlib_LTLIBRARIES = tests= manual_tests = if ENABLE_TESTS @@ -123,13 +126,14 @@ 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_CONTROLLER_HYBRID=\"name=$(CGROUP_CONTROLLER)\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \ -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \ -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \ @@ -141,7 +145,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ - -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/basic \ -I $(top_srcdir)/src/basic \ @@ -156,22 +159,14 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libelogind/sd-id128 \ -I $(top_srcdir)/src/update-utmp \ -I $(top_srcdir)/src/sleep \ + -DABS_SRC_DIR=\"$(abs_top_srcdir)\" \ + -DABS_BUILD_DIR=\"$(abs_top_builddir)\" \ $(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) @@ -369,10 +364,14 @@ libbasic_la_SOURCES = \ src/basic/prioq.h \ src/basic/strv.c \ src/basic/strv.h \ + src/basic/env-util.c \ + src/basic/env-util.h \ src/basic/log.c \ src/basic/log.h \ src/basic/bus-label.c \ src/basic/bus-label.h \ + src/basic/exec-util.c \ + src/basic/exec-util.h \ src/basic/virt.c \ src/basic/virt.h \ src/basic/smack-util.c \ @@ -417,7 +416,10 @@ libbasic_la_SOURCES = \ src/basic/copy.c \ src/basic/copy.h \ src/basic/alloc-util.h \ - src/basic/alloc-util.c + src/basic/alloc-util.c \ + src/basic/format-util.h \ + src/basic/khash.h \ + src/basic/khash.c nodist_libbasic_la_SOURCES = \ src/basic/errno-from-name.h \ @@ -456,7 +458,9 @@ libshared_la_SOURCES = \ src/shared/sleep-config.c \ src/shared/sleep-config.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h + src/shared/spawn-polkit-agent.h \ + src/shared/nsflags.h \ + src/shared/nsflags.c if HAVE_ACL libshared_la_SOURCES += \ @@ -505,9 +509,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 @@ -641,15 +643,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 @@ -673,7 +666,7 @@ header-uninstall-hook: INSTALL_EXEC_HOOKS += header-install-hook UNINSTALL_EXEC_HOOKS += header-uninstall-hook -lib_LTLIBRARIES += \ +rootlib_LTLIBRARIES += \ libelogind.la # ------------------------------------------------------------------------------ @@ -829,8 +822,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 @@ -869,6 +864,7 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ substitutions = \ + '|rootlibdir=$(rootlibdir)|' \ '|rootlibexecdir=$(rootlibexecdir)|' \ '|rootbindir=$(rootbindir)|' \ '|bindir=$(bindir)|' \ @@ -895,7 +891,8 @@ substitutions = \ SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ - < $< > $@ + -e '/^\#\# /d' \ + < $< > $@ man/%: man/%.in $(SED_PROCESS) @@ -947,6 +944,8 @@ units/user/%: units/user/%.m4 if ENABLE_POLKIT nodist_polkitpolicy_DATA = \ $(polkitpolicy_files) +polkitrules_DATA = $(polkitrules_files) +polkitpkla_DATA = $(polkitpkla_files) endif EXTRA_DIST += \ @@ -1009,9 +1008,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) @@ -1109,7 +1106,7 @@ valgrind-tests: $(TESTS) if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \ echo -e "$${x}Skipping non-binary $$f"; else \ echo -e "$${x}Running $$f"; \ - libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ + $(AM_TESTS_ENVIRONMENT) $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ x="\n\n"; \ done @@ -1193,7 +1190,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