chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build-sys: work around automake issue with files with a leading '-'
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 12254e39a8d64f30808ff7619f33685cba271e6e..0dd384e38e97d8d7dae600b81724da0a146464b8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 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
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
@@ -290,7 +290,8 @@ bin_PROGRAMS = \
        systemd-nspawn \
        systemd-detect-virt \
        systemd-delta \
        systemd-nspawn \
        systemd-detect-virt \
        systemd-delta \
-       systemd-analyze
+       systemd-analyze \
+       systemd-run
 
 dist_bin_SCRIPTS = \
        src/kernel-install/kernel-install
 
 dist_bin_SCRIPTS = \
        src/kernel-install/kernel-install
@@ -379,7 +380,7 @@ dist_systemunit_DATA = \
        units/swap.target \
        units/slices.target \
        units/system.slice \
        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 \
        units/systemd-initctl.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
@@ -498,6 +499,17 @@ EXTRA_DIST += \
        units/rc-local.service.in \
        units/halt-local.service.in
 
        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 \
 dist_doc_DATA = \
        README \
        NEWS \
@@ -849,6 +861,8 @@ libsystemd_core_la_SOURCES = \
        src/core/path.h \
        src/core/slice.c \
        src/core/slice.h \
        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 \
        src/core/load-dropin.c \
        src/core/load-dropin.h \
        src/core/execute.c \
@@ -885,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-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 \
        src/core/dbus-execute.c \
        src/core/dbus-execute.h \
        src/core/dbus-kill.c \
@@ -1098,7 +1114,8 @@ tests += \
        test-prioq \
        test-fileio \
        test-time \
        test-prioq \
        test-fileio \
        test-time \
-       test-hashmap
+       test-hashmap \
+       test-list
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1202,6 +1219,15 @@ test_hashmap_CFLAGS = \
 test_hashmap_LDADD = \
        libsystemd-core.la
 
 test_hashmap_LDADD = \
        libsystemd-core.la
 
+test_list_SOURCES = \
+       src/test/test-list.c
+
+test_list_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_list_LDADD = \
+       libsystemd-core.la
+
 test_prioq_SOURCES = \
        src/test/test-prioq.c
 
 test_prioq_SOURCES = \
        src/test/test-prioq.c
 
@@ -1705,6 +1731,18 @@ systemd_nspawn_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-bus.la
 
        libsystemd-id128-internal.la \
        libsystemd-bus.la
 
+# ------------------------------------------------------------------------------
+systemd_run_SOURCES = \
+       src/run/run.c
+
+systemd_run_LDADD = \
+       libsystemd-label.la \
+       libsystemd-capability.la \
+       libsystemd-shared.la \
+       libsystemd-daemon.la \
+       libsystemd-id128-internal.la \
+       libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
        src/stdio-bridge/stdio-bridge.c
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
        src/stdio-bridge/stdio-bridge.c
@@ -1976,6 +2014,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
        libsystemd-shared.la \
 
 libudev_la_LIBADD = \
        libsystemd-shared.la \
+       libsystemd-label.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la
 
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la
 
@@ -2563,7 +2602,6 @@ dist_udevkeymap_DATA = \
        keymaps/medion-fid2060 \
        keymaps/medionnb-a555 \
        keymaps/micro-star \
        keymaps/medion-fid2060 \
        keymaps/medionnb-a555 \
        keymaps/micro-star \
-       keymaps/module-asus-w3j \
        keymaps/module-ibm \
        keymaps/module-lenovo \
        keymaps/module-sony \
        keymaps/module-ibm \
        keymaps/module-lenovo \
        keymaps/module-sony \
@@ -2575,6 +2613,7 @@ dist_udevkeymap_DATA = \
        keymaps/oqo-model2 \
        keymaps/samsung-other \
        keymaps/samsung-series-9 \
        keymaps/oqo-model2 \
        keymaps/samsung-other \
        keymaps/samsung-series-9 \
+       keymaps/samsung-series-3 \
        keymaps/samsung-sq1us \
        keymaps/samsung-sx20s \
        keymaps/toshiba-satellite_a100 \
        keymaps/samsung-sq1us \
        keymaps/samsung-sx20s \
        keymaps/toshiba-satellite_a100 \
@@ -2589,6 +2628,7 @@ dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/hp-other \
        keymaps-force-release/samsung-other \
        keymaps-force-release/samsung-series-9 \
        keymaps-force-release/hp-other \
        keymaps-force-release/samsung-other \
        keymaps-force-release/samsung-series-9 \
+       keymaps-force-release/samsung-series-3 \
        keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
        keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
@@ -2639,6 +2679,7 @@ libsystemd_id128_la_LDFLAGS = \
 
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la \
 
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la \
+       libsystemd-label.la \
        libsystemd-daemon-internal.la
 
 libsystemd_id128_internal_la_SOURCES = \
        libsystemd-daemon-internal.la
 
 libsystemd_id128_internal_la_SOURCES = \
@@ -3538,6 +3579,70 @@ lib_LTLIBRARIES += \
        libnss_myhostname.la
 endif
 
        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 = \
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -3554,8 +3659,6 @@ systemd_logind_SOURCES = \
        src/login/logind-seat.h \
        src/login/logind-session.c \
        src/login/logind-session.h \
        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 \
        src/login/logind-user.c \
        src/login/logind-user.h \
        src/login/logind-inhibit.c \
@@ -3563,7 +3666,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-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-acl.h
 
 nodist_systemd_logind_SOURCES = \
@@ -3718,8 +3820,7 @@ nodist_systemunit_DATA += \
        units/systemd-user-sessions.service
 
 dist_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
 
 dist_dbussystemservice_DATA += \
        src/login/org.freedesktop.login1.service
Unnamed repository; edit this file 'description' to name the repository.