chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: make sure that killall does not wait for the tty
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ff8e847bbefe7562e4f95aab9cbf4872799d4fd5..00765a7c3ef143f8ef8d44adafa8fd2f4fcb6555 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-58,7
+58,6
@@
rootbin_PROGRAMS = \
systemd-notify
bin_PROGRAMS = \
systemd-notify
bin_PROGRAMS = \
- systemd-install \
systemd-cgls
if HAVE_GTK
systemd-cgls
if HAVE_GTK
@@
-77,7
+76,8
@@
noinst_PROGRAMS = \
test-ns \
test-loopback \
test-daemon \
test-ns \
test-loopback \
test-daemon \
- test-cgroup
+ test-cgroup \
+ test-env-replace
if HAVE_PAM
pamlib_LTLIBRARIES = \
if HAVE_PAM
pamlib_LTLIBRARIES = \
@@
-147,7
+147,8
@@
dist_systemunit_DATA = \
units/var-lock.mount \
units/var-run.mount \
units/printer.target \
units/var-lock.mount \
units/var-run.mount \
units/printer.target \
- units/bluetooth.target
+ units/bluetooth.target \
+ units/smartcard.target
nodist_systemunit_DATA = \
units/sysinit.target \
nodist_systemunit_DATA = \
units/sysinit.target \
@@
-194,7
+195,8
@@
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
- units/suse/reboot.service
+ units/suse/reboot.service \
+ units/suse/fsck.target
endif
if TARGET_GENTOO
endif
if TARGET_GENTOO
@@
-296,7
+298,8
@@
libsystemd_core_la_LIBADD = \
$(DBUS_LIBS) \
$(UDEV_LIBS) \
$(LIBWRAP_LIBS) \
$(DBUS_LIBS) \
$(UDEV_LIBS) \
$(LIBWRAP_LIBS) \
- $(PAM_LIBS)
+ $(PAM_LIBS) \
+ $(SELINUX_LIBS)
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
@@
-322,7
+325,6
@@
MANPAGES = \
man/systemd.1 \
man/systemctl.1 \
man/systemadm.1 \
man/systemd.1 \
man/systemctl.1 \
man/systemadm.1 \
- man/systemd-install.1 \
man/systemd-cgls.1 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/systemd-cgls.1 \
man/systemd-notify.1 \
man/sd_notify.3 \
@@
-445,6
+447,15
@@
test_cgroup_CFLAGS = \
test_cgroup_LDADD = \
libsystemd-basic.la
test_cgroup_LDADD = \
libsystemd-basic.la
+test_env_replace_SOURCES = \
+ src/test-env-replace.c
+
+test_env_replace_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_env_replace_LDADD = \
+ libsystemd-basic.la
+
systemd_logger_SOURCES = \
src/logger.c \
src/sd-daemon.c \
systemd_logger_SOURCES = \
src/logger.c \
src/sd-daemon.c \
@@
-468,7
+479,8
@@
systemd_initctl_LDADD = \
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent.c \
+ src/dbus-common.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
@@
-482,6
+494,8
@@
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/dbus-common.c \
src/systemctl.c \
src/utmp-wtmp.c \
src/dbus-common.c \
+ src/path-lookup.c \
+ src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c
src/cgroup-show.c \
src/cgroup-util.c
@@
-500,22
+514,8
@@
systemd_notify_SOURCES = \
systemd_notify_LDADD = \
libsystemd-basic.la
systemd_notify_LDADD = \
libsystemd-basic.la
-systemd_install_SOURCES = \
- src/install.c \
- src/path-lookup.c \
- src/dbus-common.c \
- src/sd-daemon.c
-
-systemd_install_LDADD = \
- libsystemd-basic.la \
- $(DBUS_LIBS)
-
-systemd_install_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
systemd_cgls_SOURCES = \
systemd_cgls_SOURCES = \
- src/
systemd-
cgls.c \
+ src/cgls.c \
src/cgroup-show.c \
src/cgroup-util.c
src/cgroup-show.c \
src/cgroup-util.c
@@
-789,6
+789,11
@@
if TARGET_GENTOO
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
+if !TARGET_SUSE
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f fsck.target && \
+ $(LN_S) sysinit.target fsck.target )
+endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \