chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-daemon: extend return value logic of sd_notify()
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d8757868e85b7bc90d10d39a6c30a73115bb062d..197407cdb05a750f6a453cfae1d0f8383aeea6c1 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-48,7
+48,8
@@
AM_CPPFLAGS = \
rootbin_PROGRAMS = \
systemd \
rootbin_PROGRAMS = \
systemd \
- systemctl
+ systemctl \
+ systemd-notify
bin_PROGRAMS = \
systemd-install
bin_PROGRAMS = \
systemd-install
@@
-67,7
+68,8
@@
noinst_PROGRAMS = \
test-engine \
test-job-type \
test-ns \
test-engine \
test-job-type \
test-ns \
- test-loopback
+ test-loopback \
+ test-daemon
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
@@
-184,6
+186,15
@@
dist_systemunit_DATA += \
units/gentoo/xdm.service
endif
units/gentoo/xdm.service
endif
+if TARGET_ARCH
+dist_systemunit_DATA += \
+ units/arch/sysinit.service \
+ units/arch/rc-local.service \
+ units/arch/halt.service \
+ units/arch/poweroff.service \
+ units/arch/reboot.service
+endif
+
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
@@
-240,7
+251,8
@@
COMMON_SOURCES = \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
- src/namespace.c
+ src/namespace.c \
+ src/tcpwrap.c
EXTRA_DIST += \
${COMMON_SOURCES:.c=.h} \
EXTRA_DIST += \
${COMMON_SOURCES:.c=.h} \
@@
-287,7
+299,9
@@
systemd_CFLAGS = \
systemd_LDADD = \
$(DBUS_LIBS) \
$(UDEV_LIBS) \
systemd_LDADD = \
$(DBUS_LIBS) \
$(UDEV_LIBS) \
- $(CGROUP_LIBS)
+ $(CGROUP_LIBS) \
+ $(LIBWRAP_LIBS) \
+ $(PAM_LIBS)
test_engine_SOURCES = \
$(COMMON_SOURCES) \
test_engine_SOURCES = \
$(COMMON_SOURCES) \
@@
-316,13
+330,19
@@
test_loopback_SOURCES = \
src/test-loopback.c \
src/loopback-setup.c
src/test-loopback.c \
src/loopback-setup.c
-test_loopback_CFLAGS = $(systemd_CFLAGS)
-test_loopback_LDADD = $(systemd_LDADD)
+test_daemon_SOURCES = \
+ $(BASIC_SOURCES) \
+ src/test-daemon.c \
+ src/sd-daemon.c
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
src/logger.c \
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
src/logger.c \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/tcpwrap.c
+
+systemd_logger_LDADD = \
+ $(LIBWRAP_LIBS)
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
@@
-354,6
+374,11
@@
systemctl_SOURCES = \
systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
systemctl_LDADD = $(DBUS_LIBS)
systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
systemctl_LDADD = $(DBUS_LIBS)
+systemd_notify_SOURCES = \
+ src/notify.c \
+ src/sd-daemon.c \
+ $(BASIC_SOURCES)
+
systemd_install_SOURCES = \
src/install.c \
src/path-lookup.c \
systemd_install_SOURCES = \
src/install.c \
src/path-lookup.c \