X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=aa7e830222ac4adaa3271c284fb5c92d4e4e4017;hp=ea186404568497391da441aee4454e86e3cfb04c;hb=7b870f607bcb8f445d4d29a776d12d9de3bf1487;hpb=54ca4fc85b3f0b9bf7f52a7be782161d780246e9 diff --git a/Makefile.am b/Makefile.am index ea1864045..aa7e83022 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,16 +32,16 @@ SUBDIRS = . po .SECONDARY: LIBUDEV_CURRENT=4 -LIBUDEV_REVISION=5 +LIBUDEV_REVISION=6 LIBUDEV_AGE=3 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=3 LIBGUDEV_AGE=1 -LIBSYSTEMD_LOGIN_CURRENT=7 -LIBSYSTEMD_LOGIN_REVISION=1 -LIBSYSTEMD_LOGIN_AGE=7 +LIBSYSTEMD_LOGIN_CURRENT=8 +LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_AGE=8 LIBSYSTEMD_DAEMON_CURRENT=0 LIBSYSTEMD_DAEMON_REVISION=10 @@ -51,9 +51,9 @@ LIBSYSTEMD_ID128_CURRENT=0 LIBSYSTEMD_ID128_REVISION=23 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=10 -LIBSYSTEMD_JOURNAL_REVISION=2 -LIBSYSTEMD_JOURNAL_AGE=10 +LIBSYSTEMD_JOURNAL_CURRENT=11 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=11 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -65,7 +65,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig polkitpolicydir=$(datadir)/polkit-1/actions bashcompletiondir=@bashcompletiondir@ -rpmmacrosdir=$(sysconfdir)/rpm +rpmmacrosdir=$(prefix)/lib/rpm/macros.d sysvinitdir=$(SYSTEM_SYSVINIT_PATH) sysvrcnddir=$(SYSTEM_SYSVRCND_PATH) varlogdir=$(localstatedir)/log @@ -380,7 +380,7 @@ dist_systemunit_DATA = \ units/swap.target \ units/slices.target \ units/system.slice \ - units/-.slice \ + units/x-.slice \ units/systemd-initctl.socket \ units/systemd-shutdownd.socket \ units/syslog.socket \ @@ -499,6 +499,17 @@ EXTRA_DIST += \ units/rc-local.service.in \ units/halt-local.service.in +# automake is broken and can't handle files with a dash in front +# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8 +units-install-hook: + mv $(DESTDIR)$(systemunitdir)/x-.slice $(DESTDIR)/$(systemunitdir)/-.slice + +units-uninstall-hook: + rm -f $(DESTDIR)/$(systemunitdir)/-.slice + +INSTALL_DATA_HOOKS += units-install-hook +UNINSTALL_DATA_HOOKS += units-uninstall-hook + dist_doc_DATA = \ README \ NEWS \ @@ -850,6 +861,8 @@ libsystemd_core_la_SOURCES = \ src/core/path.h \ src/core/slice.c \ src/core/slice.h \ + src/core/scope.c \ + src/core/scope.h \ src/core/load-dropin.c \ src/core/load-dropin.h \ src/core/execute.c \ @@ -886,6 +899,8 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-path.h \ src/core/dbus-slice.c \ src/core/dbus-slice.h \ + src/core/dbus-scope.c \ + src/core/dbus-scope.h \ src/core/dbus-execute.c \ src/core/dbus-execute.h \ src/core/dbus-kill.c \ @@ -1100,7 +1115,8 @@ tests += \ test-fileio \ test-time \ test-hashmap \ - test-list + test-list \ + test-tables EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1213,6 +1229,18 @@ test_list_CFLAGS = \ test_list_LDADD = \ libsystemd-core.la +test_tables_SOURCES = \ + src/test/test-tables.c \ + src/shared/test-tables.h + +test_tables_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_tables_LDADD = \ + libsystemd-core.la \ + libsystemd-logs.la + test_prioq_SOURCES = \ src/test/test-prioq.c @@ -1436,10 +1464,18 @@ nodist_systemunit_DATA += \ SYSINIT_TARGET_WANTS += \ systemd-modules-load.service +if ENABLE_TMPFILES +nodist_systemunit_DATA += \ + units/kmod-static-nodes.service + +SYSINIT_TARGET_WANTS += \ + kmod-static-nodes.service +endif endif EXTRA_DIST += \ - units/systemd-modules-load.service.in + units/systemd-modules-load.service.in \ + units/kmod-static-nodes.service.in # ------------------------------------------------------------------------------ if ENABLE_TMPFILES @@ -2587,7 +2623,6 @@ dist_udevkeymap_DATA = \ keymaps/medion-fid2060 \ keymaps/medionnb-a555 \ keymaps/micro-star \ - keymaps/module-asus-w3j \ keymaps/module-ibm \ keymaps/module-lenovo \ keymaps/module-sony \ @@ -3565,11 +3600,117 @@ lib_LTLIBRARIES += \ libnss_myhostname.la endif +# ------------------------------------------------------------------------------ +if ENABLE_MACHINED +systemd_machined_SOURCES = \ + src/machine/machined.c \ + src/machine/machined.h + +systemd_machined_CFLAGS = \ + $(libsystemd_machine_core_la_CFLAGS) + +systemd_machined_LDADD = \ + libsystemd-machine-core.la \ + $(libsystemd_machine_core_la_LIBADD) + +rootlibexec_PROGRAMS += \ + systemd-machined + +libsystemd_machine_core_la_SOURCES = \ + src/machine/machined-dbus.c \ + src/machine/machine.c \ + src/machine/machine.h \ + src/machine/machine-dbus.c + +libsystemd_machine_core_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +libsystemd_machine_core_la_LIBADD = \ + libsystemd-label.la \ + libsystemd-audit.la \ + libsystemd-shared.la \ + libsystemd-daemon.la \ + libsystemd-dbus.la \ + libsystemd-id128-internal.la \ + libudev.la + +noinst_LTLIBRARIES += \ + libsystemd-machine-core.la + +machinectl_SOURCES = \ + src/machine/machinectl.c + +machinectl_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +machinectl_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la \ + libudev.la + +rootbin_PROGRAMS += \ + machinectl + +test_machine_tables_SOURCES = \ + src/machine/test-machine-tables.c + +test_machine_tables_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_machine_tables_LDADD = \ + libsystemd-machine-core.la + +tests += \ + test-machine-tables + +nodist_systemunit_DATA += \ + units/systemd-machined.service + +dist_systemunit_DATA += \ + units/machine.slice + +dist_dbussystemservice_DATA += \ + src/machine/org.freedesktop.machine1.service + +dist_dbuspolicy_DATA += \ + src/machine/org.freedesktop.machine1.conf + +SYSTEM_UNIT_ALIASES += \ + systemd-machined.service dbus-org.freedesktop.machine1.service + +EXTRA_DIST += \ + units/systemd-machined.service.in + +endif + # ------------------------------------------------------------------------------ if ENABLE_LOGIND systemd_logind_SOURCES = \ src/login/logind.c \ - src/login/logind.h \ + src/login/logind.h + +nodist_systemd_logind_SOURCES = \ + src/login/logind-gperf.c + +systemd_logind_CFLAGS = \ + $(libsystemd_logind_core_la_CFLAGS) + +systemd_logind_LDADD = \ + libsystemd-logind-core.la \ + $(libsystemd_logind_core_la_LIBADD) + +if HAVE_ACL +systemd_logind_SOURCES += \ + src/login/logind-acl.c + +systemd_logind_LDADD += \ + libsystemd-acl.la +endif + +libsystemd_logind_core_la_SOURCES = \ src/login/logind-dbus.c \ src/login/logind-device.c \ src/login/logind-device.h \ @@ -3581,8 +3722,6 @@ systemd_logind_SOURCES = \ src/login/logind-seat.h \ src/login/logind-session.c \ src/login/logind-session.h \ - src/login/logind-machine.c \ - src/login/logind-machine.h \ src/login/logind-user.c \ src/login/logind-user.h \ src/login/logind-inhibit.c \ @@ -3590,17 +3729,13 @@ systemd_logind_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/login/logind-machine-dbus.c \ src/login/logind-acl.h -nodist_systemd_logind_SOURCES = \ - src/login/logind-gperf.c - -systemd_logind_CFLAGS = \ +libsystemd_logind_core_la_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) -systemd_logind_LDADD = \ +libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-audit.la \ libsystemd-shared.la \ @@ -3609,13 +3744,8 @@ systemd_logind_LDADD = \ libsystemd-id128-internal.la \ libudev.la -if HAVE_ACL -systemd_logind_SOURCES += \ - src/login/logind-acl.c - -systemd_logind_LDADD += \ - libsystemd-acl.la -endif +noinst_LTLIBRARIES += \ + libsystemd-logind-core.la systemd_user_sessions_SOURCES = \ src/login/user-sessions.c @@ -3678,10 +3808,23 @@ test_inhibit_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) +test_login_tables_SOURCES = \ + src/login/test-login-tables.c + +test_login_tables_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_login_tables_LDADD = \ + libsystemd-logind-core.la + manual_tests += \ test-login \ test-inhibit +tests += \ + test-login-tables + libsystemd_login_la_SOURCES = \ src/login/sd-login.c @@ -3745,8 +3888,7 @@ nodist_systemunit_DATA += \ units/systemd-user-sessions.service dist_systemunit_DATA += \ - units/user.slice \ - units/machine.slice + units/user.slice dist_dbussystemservice_DATA += \ src/login/org.freedesktop.login1.service @@ -4003,6 +4145,7 @@ substitutions = \ '|SUSHELL=$(SUSHELL)|' \ '|DEBUGTTY=$(DEBUGTTY)|' \ '|KILL=$(KILL)|' \ + '|KMOD=$(KMOD)|' \ '|QUOTAON=$(QUOTAON)|' \ '|QUOTACHECK=$(QUOTACHECK)|' \ '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \