X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=ca4513bdb48dfc191e0d50f7d1edc9166cdd874e;hb=460c589a92ae58c5cfb4d36dba073220ccdc565f;hp=e79756e30baec81c62fb7c6d02ee0cefd5485106;hpb=eb2059d897dbf2c5e4bc97fb950e8e5defa72f13;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index e79756e30..ca4513bdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
@@ -3568,6 +3568,70 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_MACHINED
+systemd_machined_SOURCES = \
+	src/machine/machined.c \
+	src/machine/machined.h \
+	src/machine/machined-dbus.c \
+	src/machine/machine.c \
+	src/machine/machine.h \
+	src/machine/machine-dbus.c
+
+systemd_machined_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_machined_LDADD = \
+	libsystemd-label.la \
+	libsystemd-audit.la \
+	libsystemd-shared.la \
+	libsystemd-daemon.la \
+	libsystemd-dbus.la \
+	libsystemd-id128-internal.la \
+	libudev.la
+
+rootlibexec_PROGRAMS += \
+	systemd-machined
+
+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
+
+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
+
+polkitpolicy_in_files += \
+	src/machine/org.freedesktop.machine1.policy.in
+
+EXTRA_DIST += \
+	units/systemd-machine.service.in
+
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -3584,8 +3648,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 \
@@ -3593,7 +3655,6 @@ 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 = \
@@ -3748,8 +3809,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