Commit 2f6a1ab1 authored by Michael Biebl's avatar Michael Biebl

Create convenience library libsystemd_daemon.la for sd-daemon.c

Instead of compiling sd-daemon.c 10 times, create a noinst convenience
library libsystemd_daemon.la.
parent d0ef2204
...@@ -357,7 +357,8 @@ dist_polkitpolicy_DATA = \ ...@@ -357,7 +357,8 @@ dist_polkitpolicy_DATA = \
noinst_LTLIBRARIES = \ noinst_LTLIBRARIES = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-core.la libsystemd-core.la \
libsystemd-daemon.la
libsystemd_basic_la_SOURCES = \ libsystemd_basic_la_SOURCES = \
src/util.c \ src/util.c \
...@@ -443,6 +444,9 @@ libsystemd_core_la_LIBADD = \ ...@@ -443,6 +444,9 @@ libsystemd_core_la_LIBADD = \
$(PAM_LIBS) \ $(PAM_LIBS) \
$(AUDIT_LIBS) $(AUDIT_LIBS)
libsystemd_daemon_la_SOURCES = \
src/sd-daemon.c
# This is needed because automake is buggy in how it generates the # This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't # 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. # list the .h files as dependencies if we want make dist to work.
...@@ -450,6 +454,7 @@ libsystemd_core_la_LIBADD = \ ...@@ -450,6 +454,7 @@ libsystemd_core_la_LIBADD = \
EXTRA_DIST += \ EXTRA_DIST += \
${libsystemd_basic_la_SOURCES:.c=.h} \ ${libsystemd_basic_la_SOURCES:.c=.h} \
${libsystemd_core_la_SOURCES:.c=.h} \ ${libsystemd_core_la_SOURCES:.c=.h} \
${libsystemd_daemon_la_SOURCES:.c=.h} \
src/macro.h \ src/macro.h \
src/ioprio.h \ src/ioprio.h \
src/missing.h \ src/missing.h \
...@@ -458,7 +463,6 @@ EXTRA_DIST += \ ...@@ -458,7 +463,6 @@ EXTRA_DIST += \
src/linux/auto_dev-ioctl.h \ src/linux/auto_dev-ioctl.h \
src/linux/fanotify.h \ src/linux/fanotify.h \
src/initreq.h \ src/initreq.h \
src/sd-daemon.h \
src/sd-readahead.h \ src/sd-readahead.h \
src/special.h \ src/special.h \
src/dbus-common.h \ src/dbus-common.h \
...@@ -595,11 +599,11 @@ test_hostname_LDADD = \ ...@@ -595,11 +599,11 @@ test_hostname_LDADD = \
libsystemd-basic.la libsystemd-basic.la
test_daemon_SOURCES = \ test_daemon_SOURCES = \
src/test-daemon.c \ src/test-daemon.c
src/sd-daemon.c
test_daemon_LDADD = \ test_daemon_LDADD = \
libsystemd-basic.la libsystemd-basic.la \
libsystemd-daemon.la
test_cgroup_SOURCES = \ test_cgroup_SOURCES = \
src/test-cgroup.c \ src/test-cgroup.c \
...@@ -631,16 +635,15 @@ test_strv_LDADD = \ ...@@ -631,16 +635,15 @@ test_strv_LDADD = \
systemd_logger_SOURCES = \ systemd_logger_SOURCES = \
src/logger.c \ src/logger.c \
src/sd-daemon.c \
src/tcpwrap.c src/tcpwrap.c
systemd_logger_LDADD = \ systemd_logger_LDADD = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-daemon.la \
$(LIBWRAP_LIBS) $(LIBWRAP_LIBS)
systemd_initctl_SOURCES = \ systemd_initctl_SOURCES = \
src/initctl.c \ src/initctl.c \
src/sd-daemon.c \
src/dbus-common.c src/dbus-common.c
systemd_initctl_CFLAGS = \ systemd_initctl_CFLAGS = \
...@@ -649,6 +652,7 @@ systemd_initctl_CFLAGS = \ ...@@ -649,6 +652,7 @@ systemd_initctl_CFLAGS = \
systemd_initctl_LDADD = \ systemd_initctl_LDADD = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-daemon.la \
$(DBUS_LIBS) $(DBUS_LIBS)
systemd_update_utmp_SOURCES = \ systemd_update_utmp_SOURCES = \
...@@ -677,14 +681,14 @@ systemd_random_seed_LDADD = \ ...@@ -677,14 +681,14 @@ systemd_random_seed_LDADD = \
systemd_shutdownd_SOURCES = \ systemd_shutdownd_SOURCES = \
src/utmp-wtmp.c \ src/utmp-wtmp.c \
src/sd-daemon.c \
src/shutdownd.c src/shutdownd.c
systemd_shutdownd_CFLAGS = \ systemd_shutdownd_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
systemd_shutdownd_LDADD = \ systemd_shutdownd_LDADD = \
libsystemd-basic.la libsystemd-basic.la \
libsystemd-daemon.la
systemd_shutdown_SOURCES = \ systemd_shutdown_SOURCES = \
src/mount-setup.c \ src/mount-setup.c \
...@@ -836,21 +840,20 @@ systemd_cgroups_agent_LDADD = \ ...@@ -836,21 +840,20 @@ systemd_cgroups_agent_LDADD = \
systemd_kmsg_syslogd_SOURCES = \ systemd_kmsg_syslogd_SOURCES = \
src/kmsg-syslogd.c \ src/kmsg-syslogd.c \
src/sd-daemon.c \
src/fdset.c src/fdset.c
systemd_kmsg_syslogd_CFLAGS = \ systemd_kmsg_syslogd_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
systemd_kmsg_syslogd_LDADD = \ systemd_kmsg_syslogd_LDADD = \
libsystemd-basic.la libsystemd-basic.la \
libsystemd-daemon.la
systemctl_SOURCES = \ systemctl_SOURCES = \
src/systemctl.c \ src/systemctl.c \
src/utmp-wtmp.c \ src/utmp-wtmp.c \
src/dbus-common.c \ src/dbus-common.c \
src/path-lookup.c \ src/path-lookup.c \
src/sd-daemon.c \
src/cgroup-show.c \ src/cgroup-show.c \
src/cgroup-util.c \ src/cgroup-util.c \
src/exit-status.c \ src/exit-status.c \
...@@ -862,15 +865,16 @@ systemctl_CFLAGS = \ ...@@ -862,15 +865,16 @@ systemctl_CFLAGS = \
systemctl_LDADD = \ systemctl_LDADD = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-daemon.la \
$(DBUS_LIBS) $(DBUS_LIBS)
systemd_notify_SOURCES = \ systemd_notify_SOURCES = \
src/notify.c \ src/notify.c \
src/sd-daemon.c \
src/sd-readahead.c src/sd-readahead.c
systemd_notify_LDADD = \ systemd_notify_LDADD = \
libsystemd-basic.la libsystemd-basic.la \
libsystemd-daemon.la
systemd_ask_password_SOURCES = \ systemd_ask_password_SOURCES = \
src/ask-password.c \ src/ask-password.c \
...@@ -887,7 +891,6 @@ systemd_reply_password_LDADD = \ ...@@ -887,7 +891,6 @@ systemd_reply_password_LDADD = \
systemd_readahead_collect_SOURCES = \ systemd_readahead_collect_SOURCES = \
src/readahead-collect.c \ src/readahead-collect.c \
src/sd-daemon.c \
src/readahead-common.c src/readahead-common.c
systemd_readahead_collect_CFLAGS = \ systemd_readahead_collect_CFLAGS = \
...@@ -895,11 +898,11 @@ systemd_readahead_collect_CFLAGS = \ ...@@ -895,11 +898,11 @@ systemd_readahead_collect_CFLAGS = \
systemd_readahead_collect_LDADD = \ systemd_readahead_collect_LDADD = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-daemon.la \
$(UDEV_LIBS) $(UDEV_LIBS)
systemd_readahead_replay_SOURCES = \ systemd_readahead_replay_SOURCES = \
src/readahead-replay.c \ src/readahead-replay.c \
src/sd-daemon.c \
src/readahead-common.c src/readahead-common.c
systemd_readahead_replay_CFLAGS = \ systemd_readahead_replay_CFLAGS = \
...@@ -907,6 +910,7 @@ systemd_readahead_replay_CFLAGS = \ ...@@ -907,6 +910,7 @@ systemd_readahead_replay_CFLAGS = \
systemd_readahead_replay_LDADD = \ systemd_readahead_replay_LDADD = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-daemon.la \
$(UDEV_LIBS) $(UDEV_LIBS)
systemd_cgls_SOURCES = \ systemd_cgls_SOURCES = \
...@@ -985,8 +989,7 @@ systemd_tty_ask_password_agent_LDADD = \ ...@@ -985,8 +989,7 @@ systemd_tty_ask_password_agent_LDADD = \
pam_systemd_la_SOURCES = \ pam_systemd_la_SOURCES = \
src/pam-module.c \ src/pam-module.c \
src/cgroup-util.c \ src/cgroup-util.c
src/sd-daemon.c
pam_systemd_la_CFLAGS = \ pam_systemd_la_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
...@@ -1001,6 +1004,7 @@ pam_systemd_la_LDFLAGS = \ ...@@ -1001,6 +1004,7 @@ pam_systemd_la_LDFLAGS = \
pam_systemd_la_LIBADD = \ pam_systemd_la_LIBADD = \
libsystemd-basic.la \ libsystemd-basic.la \
libsystemd-daemon.la \
$(PAM_LIBS) $(PAM_LIBS)
SED_PROCESS = \ SED_PROCESS = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment