X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f18cccd070d36ba935f84da93058670ac002cf18;hb=db059f1b031a92ed45b62d1036877abd9c128d1b;hp=f1c2ce05b56152519a7ad7f715048c38ee66c0b6;hpb=6a6633a16a510b40c6ad30cd0858699619384a44;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f1c2ce05b..f18cccd07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=$(sysconfdir)/bash_completion.d
+bashcompletiondir=@bashcompletiondir@
 rpmmacrosdir=$(sysconfdir)/rpm
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@ -267,8 +267,7 @@ rootbin_PROGRAMS = \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
 	systemd-tmpfiles \
-	systemd-machine-id-setup \
-	systemd-analyze
+	systemd-machine-id-setup
 
 bin_PROGRAMS = \
 	systemd-cgls \
@@ -276,7 +275,14 @@ bin_PROGRAMS = \
 	systemd-stdio-bridge \
 	systemd-nspawn \
 	systemd-detect-virt \
-	systemd-delta
+	systemd-delta \
+	systemd-analyze
+
+bin_SCRIPTS = \
+	src/kernel-install/kernel-install
+
+EXTRA_DIST += \
+	src/kernel-install/kernel-install
 
 rootlibexec_PROGRAMS = \
 	systemd \
@@ -310,7 +316,10 @@ systemd_analyze_LDADD = \
 	libsystemd-dbus.la
 
 dist_bashcompletion_DATA = \
-	shell-completion/systemd-bash-completion.sh
+	shell-completion/bash/journalctl \
+	shell-completion/bash/systemctl \
+	shell-completion/bash/systemd-coredumpctl \
+	shell-completion/bash/udevadm
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
@@ -373,7 +382,12 @@ dist_systemunit_DATA = \
 	units/systemd-ask-password-console.path \
 	units/systemd-udevd-control.socket \
 	units/systemd-udevd-kernel.socket \
-	units/system-update.target
+	units/system-update.target \
+	units/initrd-parse-etc.service \
+	units/initrd-cleanup.service \
+	units/initrd-switch-root.target \
+	units/initrd-udevadm-cleanup-db.service \
+	units/initrd-switch-root.service
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
@@ -513,7 +527,7 @@ man/index.html:
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in $(top_builddir)/man/*.xml)
 update-man-list: make-man-rules.py $(XML_GLOB)
 	$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
 	$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
@@ -849,6 +863,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/tcpwrap.h \
 	src/core/cgroup-attr.c \
 	src/core/cgroup-attr.h \
+	src/core/cgroup-semantics.c \
+	src/core/cgroup-semantics.h \
 	src/core/securebits.h \
 	src/core/initreq.h \
 	src/core/special.h \
@@ -1560,7 +1576,6 @@ libsystemd_daemon_la_CFLAGS = \
 
 libsystemd_daemon_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
@@ -2261,7 +2276,6 @@ libsystemd_id128_la_CFLAGS = \
 
 libsystemd_id128_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
@@ -2307,6 +2321,18 @@ EXTRA_DIST += \
 	src/libsystemd-id128/libsystemd-id128.pc.in \
 	src/libsystemd-id128/libsystemd-id128.sym
 
+# ------------------------------------------------------------------------------
+
+rootlibexec_PROGRAMS += \
+	systemd-activate
+
+systemd_activate_SOURCES = \
+	src/activate/activate.c
+
+systemd_activate_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-daemon.la
+
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
 	src/journal/journald.c \
@@ -2452,7 +2478,6 @@ libsystemd_journal_la_CFLAGS = \
 
 libsystemd_journal_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
@@ -2554,6 +2579,8 @@ libsystemd-journal-uninstall-hook:
 INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
 UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
 
+# ------------------------------------------------------------------------------
+
 # Update catalog on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
 catalog-update-hook:
@@ -2948,6 +2975,9 @@ hostnamectl_LDADD = \
 bin_PROGRAMS += \
 	hostnamectl
 
+dist_bashcompletion_DATA += \
+	shell-completion/bash/hostnamectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3021,6 +3051,9 @@ localectl_LDADD = \
 bin_PROGRAMS += \
 	localectl
 
+dist_bashcompletion_DATA += \
+	shell-completion/bash/localectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3087,6 +3120,9 @@ timedatectl_LDADD = \
 
 bin_PROGRAMS += \
 	timedatectl
+
+dist_bashcompletion_DATA += \
+	shell-completion/bash/timedatectl
 endif
 
 polkitpolicy_in_files += \
@@ -3209,6 +3245,9 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
 	loginctl
 
+dist_bashcompletion_DATA += \
+	shell-completion/bash/loginctl
+
 systemd_inhibit_SOURCES = \
 	src/login/inhibit.c
 
@@ -3254,7 +3293,6 @@ libsystemd_login_la_CFLAGS = \
 
 libsystemd_login_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-shared \
 	-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
 
@@ -3759,6 +3797,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
+	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr