X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=41a0f77528282d8886858d2834017c96fd61b21b;hb=84e95f5f10da05aced04f9785d3db729c29c45e3;hp=7facc7610600c1c5d8ad875a88b5947ab74fcbb8;hpb=07045a1a92c839fd2af80bd0c060a595021bc3b3;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 7facc7610..41a0f7752 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=14 +LIBELOGIND_CURRENT=15 LIBELOGIND_REVISION=0 -LIBELOGIND_AGE=14 +LIBELOGIND_AGE=15 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -58,7 +58,7 @@ PKTTYAGENT=$(bindir)/pkttyagent # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/elogind -pkgincludedir=$(includedir)/elogind +pkgincludedir=$(includedir)/elogind/systemd udevrulesdir=@udevrulesdir@ udevbindir=@udevbindir@ udevlibexecdir=$(udevbindir) @@ -90,6 +90,7 @@ polkitpolicy_files = dist_udevrules_DATA = nodist_udevrules_DATA = dist_pkgsysconf_DATA = +nodist_pkgsysconf_DATA = dist_dbuspolicy_DATA = dist_dbussystemservice_DATA = check_PROGRAMS = @@ -128,7 +129,7 @@ AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ -DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \ - -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \ + -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \ -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \ -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \ -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \ @@ -151,6 +152,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libelogind/sd-bus \ -I $(top_srcdir)/src/libelogind/sd-event \ -I $(top_srcdir)/src/libelogind/sd-login \ + -I $(top_srcdir)/src/update-utmp \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -297,8 +299,6 @@ noinst_LTLIBRARIES += \ libbasic_la_SOURCES = \ src/basic/missing.h \ - src/basic/musl_missing.h \ - src/basic/musl_missing.c \ src/basic/capability-util.c \ src/basic/capability-util.h \ src/basic/conf-files.c \ @@ -343,6 +343,8 @@ libbasic_la_SOURCES = \ src/basic/escape.h \ src/basic/path-util.c \ src/basic/path-util.h \ + src/basic/parse-printf-format.c \ + src/basic/parse-printf-format.h \ src/basic/time-util.c \ src/basic/time-util.h \ src/basic/locale-util.c \ @@ -412,9 +414,7 @@ libbasic_la_SOURCES = \ src/basic/copy.c \ src/basic/copy.h \ src/basic/alloc-util.h \ - src/basic/alloc-util.c \ - src/basic/parse-printf-format.c \ - src/basic/parse-printf-format.h + src/basic/alloc-util.c nodist_libbasic_la_SOURCES = \ src/basic/errno-from-name.h \ @@ -440,16 +440,24 @@ noinst_LTLIBRARIES += \ libshared.la libshared_la_SOURCES = \ + src/shared/bus-util.c \ + src/shared/bus-util.h \ + src/shared/clean-ipc.c \ + src/shared/clean-ipc.h \ src/shared/conf-parser.c \ src/shared/conf-parser.h \ + src/shared/musl_missing.h \ + src/shared/musl_missing.c \ src/shared/pager.c \ src/shared/pager.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h \ - src/shared/clean-ipc.c \ - src/shared/clean-ipc.h \ - src/shared/bus-util.c \ - src/shared/bus-util.h + 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 += \ @@ -624,6 +632,19 @@ pkginclude_HEADERS += \ src/systemd/sd-id128.h \ src/systemd/_sd-common.h +header-install-hook: + $(MKDIR_P) $(DESTDIR)/$(pkgincludedir) + cd $(DESTDIR)/$(includedir)/elogind && \ + for hdr in $(notdir $(pkginclude_HEADERS)) ; do \ + rm -f $$hdr ; \ + $(LN_S) systemd/$$hdr $$hdr ; \ + done + +header-uninstall-hook: + m -f $(DESTDIR)/$(includedir)/elogind/*.h + +INSTALL_EXEC_HOOKS += header-install-hook +UNINSTALL_EXEC_HOOKS += header-uninstall-hook lib_LTLIBRARIES += \ libelogind.la @@ -663,6 +684,7 @@ libelogind_core_la_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ + src/login/logind-utmp.c \ src/login/logind-acl.h \ src/core/cgroup.h \ src/core/cgroup.c \ @@ -779,7 +801,7 @@ dist_dbussystemservice_DATA += \ dist_dbuspolicy_DATA += \ src/login/org.freedesktop.login1.conf -dist_pkgsysconf_DATA += \ +nodist_pkgsysconf_DATA += \ src/login/logind.conf polkitpolicy_files += \ @@ -801,7 +823,8 @@ gperf_gperf_sources = \ EXTRA_DIST += \ src/login/71-seat.rules.in \ - src/login/73-seat-late.rules.in + src/login/73-seat-late.rules.in \ + src/login/logind.conf.in # ------------------------------------------------------------------------------ substitutions = \ @@ -823,6 +846,7 @@ substitutions = \ '|udevlibexecdir=$(udevlibexecdir)|' \ '|KILL=$(KILL)|' \ '|MKDIR_P=$(MKDIR_P)|' \ + '|KILL_USER_PROCESSES=$(KILL_USER_PROCESSES)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ '|systemgidmax=$(SYSTEM_GID_MAX)|' \ '|TTY_GID=$(TTY_GID)|' @@ -973,7 +997,6 @@ DISTCHECK_CONFIGURE_FLAGS += \ endif .PHONY: dist-check-help - dist-check-help: $(rootbin_PROGRAMS) for i in $(abspath $^); do \ if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \ @@ -982,6 +1005,18 @@ dist-check-help: $(rootbin_PROGRAMS) exit 1; \ fi; done +include_compilers = "$(CC)" "$(CC) -ansi" "$(CC) -std=iso9899:1990" +public_headers = $(filter-out src/systemd/_sd-common.h, $(pkginclude_HEADERS) $(include_HEADERS)) +.PHONY: dist-check-includes +dist-check-includes: $(public_headers) + @res=0; \ + for i in $(abspath $^); do \ + for cc in $(include_compilers); do \ + echo "$$cc -o/dev/null -c -x c -include "$$i" -