chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket: disable GC for pre-allocated per-connection service until it is used
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3c54043975133efb0eb1808be19043d54e0f0f61..cb2318406da32f9e712286fa1a727a61a0d20f88 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-68,7
+68,8
@@
endif
rootlibexec_PROGRAMS = \
systemd-logger \
systemd-cgroups-agent \
rootlibexec_PROGRAMS = \
systemd-logger \
systemd-cgroups-agent \
- systemd-initctl
+ systemd-initctl \
+ systemd-update-utmp
noinst_PROGRAMS = \
test-engine \
noinst_PROGRAMS = \
test-engine \
@@
-188,7
+189,9
@@
dist_systemunit_DATA += \
units/fedora/rc-local.service \
units/fedora/reboot.service \
units/fedora/sysinit.service \
units/fedora/rc-local.service \
units/fedora/reboot.service \
units/fedora/sysinit.service \
- units/fedora/single.service
+ units/fedora/single.service \
+ units/fedora/plymouth-quit.service \
+ units/fedora/plymouth-shutdown.service
endif
if TARGET_SUSE
endif
if TARGET_SUSE
@@
-241,6
+244,13
@@
libsystemd_basic_la_SOURCES = \
src/log.c \
src/ratelimit.c
src/log.c \
src/ratelimit.c
+libsystemd_basic_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+ $(SELINUX_LIBS)
+
libsystemd_core_la_SOURCES = \
src/unit.c \
src/job.c \
libsystemd_core_la_SOURCES = \
src/unit.c \
src/job.c \
@@
-280,7
+290,6
@@
libsystemd_core_la_SOURCES = \
src/loopback-setup.c \
src/kmod-setup.c \
src/modprobe-setup.c \
src/loopback-setup.c \
src/kmod-setup.c \
src/modprobe-setup.c \
- src/utmp-wtmp.c \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
@@
-291,7
+300,10
@@
libsystemd_core_la_SOURCES = \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UDEV_CFLAGS)
+ $(UDEV_CFLAGS) \
+ $(LIBWRAP_CFLAGS) \
+ $(PAM_CFLAGS) \
+ $(AUDIT_CFLAGS)
libsystemd_core_la_LIBADD = \
libsystemd-basic.la \
libsystemd_core_la_LIBADD = \
libsystemd-basic.la \
@@
-299,7
+311,7
@@
libsystemd_core_la_LIBADD = \
$(UDEV_LIBS) \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(UDEV_LIBS) \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
- $(
SELINUX
_LIBS)
+ $(
AUDIT
_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
@@
-478,8
+490,24
@@
systemd_initctl_LDADD = \
libsystemd-basic.la \
$(DBUS_LIBS)
libsystemd-basic.la \
$(DBUS_LIBS)
+systemd_update_utmp_SOURCES = \
+ src/update-utmp.c \
+ src/dbus-common.c \
+ src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+ libsystemd-basic.la \
+ $(DBUS_LIBS) \
+ $(AUDIT_LIBS)
+
systemd_cgroups_agent_SOURCES = \
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) \
@@
-761,7
+789,8
@@
install-data-hook:
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
- $(DESTDIR)$(systemunitdir)/rescue.target.wants
+ $(DESTDIR)$(systemunitdir)/rescue.target.wants \
+ $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@
-769,11
+798,15
@@
if TARGET_FEDORA
rm -f prefdm.service && \
$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f prefdm.service && \
$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f rc-local.service && \
- $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+ rm -f rc-local.service plymouth-quit.service && \
+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \
+ $(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service )
( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
rm -f single.service && \
$(LN_S) $(systemunitdir)/single.service single.service )
( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
rm -f single.service && \
$(LN_S) $(systemunitdir)/single.service single.service )
+ ( cd $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants && \
+ rm -f plymouth-shutdown.service && \
+ $(LN_S) $(systemunitdir)/plymouth-shutdown.service plymouth-shutdown.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )