diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index f1c2ce05b5..790e5014be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ @@ -513,7 +519,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 +855,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 +1568,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 +2268,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 @@ -2308,6 +2314,18 @@ EXTRA_DIST += \ 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 \ src/journal/journald-server.h @@ -2452,7 +2470,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 +2571,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: @@ -3254,7 +3273,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 |