build-sys: remove $(DBUS_LIBS), libsystemd-dbus.la pulls it in

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 813ced272e511d38c79f9f1b211bbd8c5e35342c..062ca0af2307dc7b62270681b43eb5b8718a621d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,7 +244,7 @@ noinst_PROGRAMS = \
        test-watchdog
 
 dist_bashcompletion_DATA = \
-       src/systemd-bash-completion.sh
+       bash-completion/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -521,12 +521,12 @@ noinst_LTLIBRARIES += \
        libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
-       src/linux/auto_dev-ioctl.h \
-       src/linux/fanotify.h \
+       src/shared/linux/auto_dev-ioctl.h \
+       src/shared/linux/fanotify.h \
+       src/shared/missing.h \
        src/shared/list.h \
        src/shared/macro.h \
        src/shared/def.h \
-       src/shared/missing.h \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/virt.c \
@@ -554,8 +554,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/socket-util.h \
        src/shared/cgroup-util.c \
        src/shared/cgroup-util.h \
-       src/shared/logs-show.c \
-       src/shared/logs-show.h \
        src/shared/cgroup-show.c \
        src/shared/cgroup-show.h \
        src/shared/unit-name.c \
@@ -566,12 +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/mount-setup.c \
-       src/shared/mount-setup.h \
-       src/shared/machine-id-setup.c \
-       src/shared/machine-id-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 \
@@ -626,6 +618,21 @@ libsystemd_label_la_CFLAGS = \
 libsystemd_label_la_LIBADD = \
        $(SELINUX_LIBS)
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-logs.la
+
+libsystemd_logs_la_SOURCES = \
+       src/shared/logs-show.c \
+       src/shared/logs-show.h
+
+libsystemd_logs_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libsystemd_logs_la_LIBADD = \
+       libsystemd-journal.la \
+       libsystemd-id128.la
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-capability.la
@@ -748,6 +755,12 @@ libsystemd_core_la_SOURCES = \
        src/core/locale-setup.c \
        src/core/hostname-setup.c \
        src/core/hostname-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 \
@@ -783,7 +796,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-dbus.la \
        libudev.la \
-       $(DBUS_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
@@ -888,7 +900,8 @@ test_loopback_SOURCES = \
        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
@@ -941,7 +954,7 @@ test_watchdog_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
-       src/initctl.c
+       src/initctl/initctl.c
 
 systemd_initctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -950,12 +963,11 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
-       src/update-utmp.c
+       src/update-utmp/update-utmp.c
 
 systemd_update_utmp_CFLAGS = \
        $(AM_CFLAGS) \
@@ -965,12 +977,11 @@ systemd_update_utmp_CFLAGS = \
 systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
        libsystemd-dbus.la \
-       $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
-       src/shutdownd.c
+       src/shutdownd/shutdownd.c
 
 systemd_shutdownd_LDADD = \
        libsystemd-label.la \
@@ -984,7 +995,9 @@ pkginclude_HEADERS += \
 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 \
@@ -993,7 +1006,7 @@ systemd_shutdown_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_modules_load_SOURCES = \
-       src/modules-load.c
+       src/modules-load/modules-load.c
 
 systemd_modules_load_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1005,7 +1018,7 @@ systemd_modules_load_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
-       src/tmpfiles.c
+       src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
        libsystemd-label.la \
@@ -1013,7 +1026,9 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup/machine-id-setup-main.c
+       src/machine-id-setup/machine-id-setup-main.c \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
@@ -1022,14 +1037,14 @@ systemd_machine_id_setup_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
-       src/sysctl.c
+       src/sysctl/sysctl.c
 
 systemd_sysctl_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
-       src/fsck.c
+       src/fsck/fsck.c
 
 systemd_fsck_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1038,19 +1053,18 @@ systemd_fsck_CFLAGS = \
 systemd_fsck_LDADD = \
        libsystemd-shared.la \
        libsystemd-dbus.la \
-       libudev.la \
-       $(DBUS_LIBS)
+       libudev.la
 
 # ------------------------------------------------------------------------------
 systemd_timestamp_SOURCES = \
-       src/timestamp.c
+       src/timestamp/timestamp.c
 
 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 \
@@ -1058,14 +1072,14 @@ systemd_ac_power_LDADD = \
 
 # ------------------------------------------------------------------------------
 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 = \
-       src/getty-generator.c
+       src/getty-generator/getty-generator.c
 
 systemd_getty_generator_LDADD = \
        libsystemd-label.la \
@@ -1073,7 +1087,7 @@ systemd_getty_generator_LDADD = \
 
 # ------------------------------------------------------------------------------
 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 \
@@ -1081,14 +1095,16 @@ systemd_rc_local_generator_LDADD = \
 
 # ------------------------------------------------------------------------------
 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 = \
-       src/cgroups-agent.c
+       src/cgroups-agent/cgroups-agent.c
 
 systemd_cgroups_agent_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1096,12 +1112,11 @@ systemd_cgroups_agent_CFLAGS = \
 
 systemd_cgroups_agent_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
-       src/systemctl.c
+       src/systemctl/systemctl.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1114,11 +1129,11 @@ systemctl_LDADD = \
        libsystemd-journal.la \
        libsystemd-id128.la \
        libsystemd-dbus.la \
-       $(DBUS_LIBS)
+       libsystemd-logs.la
 
 # ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
-       src/notify.c \
+       src/notify/notify.c \
        src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
@@ -1127,7 +1142,7 @@ systemd_notify_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
-       src/ask-password.c
+       src/ask-password/ask-password.c
 
 systemd_ask_password_LDADD = \
        libsystemd-label.la \
@@ -1135,28 +1150,32 @@ systemd_ask_password_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
-       src/reply-password.c
+       src/reply-password/reply-password.c
 
 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 = \
-       src/cgtop.c
+       src/cgtop/cgtop.c
 
 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 \
@@ -1173,7 +1192,7 @@ systemd_stdio_bridge_LDADD = \
 
 # ------------------------------------------------------------------------------
 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 \
@@ -1998,17 +2017,8 @@ journalctl_SOURCES = \
 journalctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal.la \
-       libsystemd-id128.la
-
-if HAVE_XZ
-journalctl_SOURCES += \
-       src/journal/compress.c
-journalctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS)
-journalctl_LDADD += \
-       $(XZ_LIBS)
-endif
+       libsystemd-id128.la \
+       libsystemd-logs.la
 
 test_journal_SOURCES = \
        src/journal/test-journal.c \
@@ -2299,7 +2309,7 @@ EXTRA_DIST += \
        units/quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
-       src/quotacheck.c
+       src/quotacheck/quotacheck.c
 
 systemd_quotacheck_LDADD = \
        libsystemd-shared.la
@@ -2319,7 +2329,7 @@ EXTRA_DIST += \
        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 \
@@ -2394,8 +2404,7 @@ systemd_hostnamed_CFLAGS = \
 systemd_hostnamed_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
        systemd-hostnamed
@@ -2445,8 +2454,7 @@ systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 nodist_systemunit_DATA += \
        units/systemd-localed.service
@@ -2505,8 +2513,7 @@ systemd_timedated_CFLAGS = \
 systemd_timedated_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
        systemd-timedated
@@ -2575,8 +2582,7 @@ systemd_logind_LDADD = \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libsystemd-dbus.la \
-       libudev.la \
-       $(DBUS_LIBS)
+       libudev.la
 
 if HAVE_ACL
 systemd_logind_SOURCES += \
@@ -2607,8 +2613,7 @@ loginctl_CFLAGS = \
 loginctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-dbus.la \
-       libudev.la \
-       $(DBUS_LIBS)
+       libudev.la
 
 rootbin_PROGRAMS += \
        loginctl
@@ -2660,9 +2665,9 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
        libsystemd-daemon.la \
        libsystemd-audit.la \
+       libsystemd-dbus.la \
        libsystemd-shared.la \
-       $(PAM_LIBS) \
-       $(DBUS_LIBS)
+       $(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
        pam_systemd.la