chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: move *-setup out of shared to avoid selinux being pulled in
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index edf92e3fff9a3969872596326a3ec292820c48ad..ff156c00eefb1a44901e77a8d6b0ff4e5e09714d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-564,10
+564,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/watchdog.h \
src/shared/spawn-ask-password-agent.c \
src/shared/spawn-ask-password-agent.h \
src/shared/watchdog.h \
src/shared/spawn-ask-password-agent.c \
src/shared/spawn-ask-password-agent.h \
- src/shared/mount-setup.c \
- src/shared/mount-setup.h \
- src/shared/loopback-setup.h \
- src/shared/loopback-setup.c \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
@@
-759,8
+755,12
@@
libsystemd_core_la_SOURCES = \
src/core/locale-setup.c \
src/core/hostname-setup.c \
src/core/hostname-setup.h \
src/core/locale-setup.c \
src/core/hostname-setup.c \
src/core/hostname-setup.h \
- src/shared/machine-id-setup.c \
- src/shared/machine-id-setup.h \
+ src/core/machine-id-setup.c \
+ src/core/machine-id-setup.h \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h \
+ src/core/loopback-setup.h \
+ src/core/loopback-setup.c \
src/core/fdset.c \
src/core/fdset.h \
src/core/condition.c \
src/core/fdset.c \
src/core/fdset.h \
src/core/condition.c \
@@
-901,7
+901,8
@@
test_loopback_SOURCES = \
src/test/test-loopback.c
test_loopback_LDADD = \
src/test/test-loopback.c
test_loopback_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-core.la
test_hostname_SOURCES = \
src/test/test-hostname.c
test_hostname_SOURCES = \
src/test/test-hostname.c
@@
-954,7
+955,7
@@
test_watchdog_LDADD = \
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
- src/initctl.c
+ src/initctl
/initctl
.c
systemd_initctl_CFLAGS = \
$(AM_CFLAGS) \
systemd_initctl_CFLAGS = \
$(AM_CFLAGS) \
@@
-968,7
+969,7
@@
systemd_initctl_LDADD = \
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
- src/update-utmp.c
+ src/update-utmp
/update-utmp
.c
systemd_update_utmp_CFLAGS = \
$(AM_CFLAGS) \
systemd_update_utmp_CFLAGS = \
$(AM_CFLAGS) \
@@
-983,7
+984,7
@@
systemd_update_utmp_LDADD = \
# ------------------------------------------------------------------------------
systemd_shutdownd_SOURCES = \
# ------------------------------------------------------------------------------
systemd_shutdownd_SOURCES = \
- src/shutdownd.c
+ src/shutdownd
/shutdownd
.c
systemd_shutdownd_LDADD = \
libsystemd-label.la \
systemd_shutdownd_LDADD = \
libsystemd-label.la \
@@
-997,7
+998,9
@@
pkginclude_HEADERS += \
systemd_shutdown_SOURCES = \
src/core/umount.c \
src/core/umount.h \
systemd_shutdown_SOURCES = \
src/core/umount.c \
src/core/umount.h \
- src/core/shutdown.c
+ src/core/shutdown.c \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h
systemd_shutdown_LDADD = \
libsystemd-label.la \
systemd_shutdown_LDADD = \
libsystemd-label.la \
@@
-1006,7
+1009,7
@@
systemd_shutdown_LDADD = \
# ------------------------------------------------------------------------------
systemd_modules_load_SOURCES = \
# ------------------------------------------------------------------------------
systemd_modules_load_SOURCES = \
- src/modules-load.c
+ src/modules-load
/modules-load
.c
systemd_modules_load_CFLAGS = \
$(AM_CFLAGS) \
systemd_modules_load_CFLAGS = \
$(AM_CFLAGS) \
@@
-1018,7
+1021,7
@@
systemd_modules_load_LDADD = \
# ------------------------------------------------------------------------------
systemd_tmpfiles_SOURCES = \
# ------------------------------------------------------------------------------
systemd_tmpfiles_SOURCES = \
- src/tmpfiles.c
+ src/tmpfiles
/tmpfiles
.c
systemd_tmpfiles_LDADD = \
libsystemd-label.la \
systemd_tmpfiles_LDADD = \
libsystemd-label.la \
@@
-1027,8
+1030,8
@@
systemd_tmpfiles_LDADD = \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
- src/
shared
/machine-id-setup.c \
- src/
shared
/machine-id-setup.h
+ src/
core
/machine-id-setup.c \
+ src/
core
/machine-id-setup.h
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
@@
-1037,14
+1040,14
@@
systemd_machine_id_setup_LDADD = \
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
- src/sysctl.c
+ src/sysctl
/sysctl
.c
systemd_sysctl_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
systemd_sysctl_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
- src/fsck.c
+ src/fsck
/fsck
.c
systemd_fsck_CFLAGS = \
$(AM_CFLAGS) \
systemd_fsck_CFLAGS = \
$(AM_CFLAGS) \
@@
-1058,14
+1061,14
@@
systemd_fsck_LDADD = \
# ------------------------------------------------------------------------------
systemd_timestamp_SOURCES = \
# ------------------------------------------------------------------------------
systemd_timestamp_SOURCES = \
- src/timestamp.c
+ src/timestamp
/timestamp
.c
systemd_timestamp_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
systemd_timestamp_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
- src/ac-power.c
+ src/ac-power
/ac-power
.c
systemd_ac_power_LDADD = \
libsystemd-shared.la \
systemd_ac_power_LDADD = \
libsystemd-shared.la \
@@
-1073,14
+1076,14
@@
systemd_ac_power_LDADD = \
# ------------------------------------------------------------------------------
systemd_detect_virt_SOURCES = \
# ------------------------------------------------------------------------------
systemd_detect_virt_SOURCES = \
- src/detect-virt.c
+ src/detect-virt
/detect-virt
.c
systemd_detect_virt_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
systemd_detect_virt_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
- src/getty-generator.c
+ src/getty-generator
/getty-generator
.c
systemd_getty_generator_LDADD = \
libsystemd-label.la \
systemd_getty_generator_LDADD = \
libsystemd-label.la \
@@
-1088,7
+1091,7
@@
systemd_getty_generator_LDADD = \
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
- src/rc-local-generator.c
+ src/rc-local-generator
/rc-local-generator
.c
systemd_rc_local_generator_LDADD = \
libsystemd-label.la \
systemd_rc_local_generator_LDADD = \
libsystemd-label.la \
@@
-1096,14
+1099,16
@@
systemd_rc_local_generator_LDADD = \
# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
- src/remount-api-vfs.c
+ src/remount-api-vfs/remount-api-vfs.c \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h
systemd_remount_api_vfs_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_cgroups_agent_SOURCES = \
systemd_remount_api_vfs_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent
/cgroups-agent
.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
@@
-1116,7
+1121,7
@@
systemd_cgroups_agent_LDADD = \
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
- src/systemctl.c
+ src/systemctl
/systemctl
.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_CFLAGS = \
$(AM_CFLAGS) \
@@
-1134,7
+1139,7
@@
systemctl_LDADD = \
# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
- src/notify.c \
+ src/notify
/notify
.c \
src/readahead/sd-readahead.c
systemd_notify_LDADD = \
src/readahead/sd-readahead.c
systemd_notify_LDADD = \
@@
-1143,7
+1148,7
@@
systemd_notify_LDADD = \
# ------------------------------------------------------------------------------
systemd_ask_password_SOURCES = \
# ------------------------------------------------------------------------------
systemd_ask_password_SOURCES = \
- src/ask-password.c
+ src/ask-password
/ask-password
.c
systemd_ask_password_LDADD = \
libsystemd-label.la \
systemd_ask_password_LDADD = \
libsystemd-label.la \
@@
-1151,28
+1156,32
@@
systemd_ask_password_LDADD = \
# ------------------------------------------------------------------------------
systemd_reply_password_SOURCES = \
# ------------------------------------------------------------------------------
systemd_reply_password_SOURCES = \
- src/reply-password.c
+ src/reply-password
/reply-password
.c
systemd_reply_password_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_cgls_SOURCES = \
systemd_reply_password_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_cgls_SOURCES = \
- src/cgls.c
+ src/cgls
/cgls
.c
systemd_cgls_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_cgtop_SOURCES = \
systemd_cgls_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_cgtop_SOURCES = \
- src/cgtop.c
+ src/cgtop
/cgtop
.c
systemd_cgtop_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
systemd_cgtop_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
- src/nspawn.c
+ src/nspawn/nspawn.c \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h \
+ src/core/loopback-setup.c \
+ src/core/loopback-setup.h
systemd_nspawn_LDADD = \
libsystemd-label.la \
systemd_nspawn_LDADD = \
libsystemd-label.la \
@@
-1189,7
+1198,7
@@
systemd_stdio_bridge_LDADD = \
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
- src/tty-ask-password-agent.c
+ src/tty-ask-password-agent
/tty-ask-password-agent
.c
systemd_tty_ask_password_agent_LDADD = \
libsystemd-label.la \
systemd_tty_ask_password_agent_LDADD = \
libsystemd-label.la \
@@
-2306,7
+2315,7
@@
EXTRA_DIST += \
units/quotacheck.service.in
systemd_quotacheck_SOURCES = \
units/quotacheck.service.in
systemd_quotacheck_SOURCES = \
- src/quotacheck.c
+ src/quotacheck
/quotacheck
.c
systemd_quotacheck_LDADD = \
libsystemd-shared.la
systemd_quotacheck_LDADD = \
libsystemd-shared.la
@@
-2326,7
+2335,7
@@
EXTRA_DIST += \
units/systemd-random-seed-load.service.in
systemd_random_seed_SOURCES = \
units/systemd-random-seed-load.service.in
systemd_random_seed_SOURCES = \
- src/random-seed.c
+ src/random-seed
/random-seed
.c
systemd_random_seed_LDADD = \
libsystemd-label.la \
systemd_random_seed_LDADD = \
libsystemd-label.la \