build-sys: introduce seperate convenience library for dbus stuff

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2c047a0f50593154374894bf95502eff895f4650..813ced272e511d38c79f9f1b211bbd8c5e35342c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,6 +130,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/login \
+       -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/systemd \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/udev
@@ -520,9 +521,12 @@ noinst_LTLIBRARIES += \
        libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
-       src/missing.h \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.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 \
@@ -550,8 +554,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/socket-util.h \
        src/shared/cgroup-util.c \
        src/shared/cgroup-util.h \
-       src/shared/dbus-common.c \
-       src/shared/dbus-common.h \
        src/shared/logs-show.c \
        src/shared/logs-show.h \
        src/shared/cgroup-show.c \
@@ -573,15 +575,31 @@ libsystemd_shared_la_SOURCES = \
        src/shared/specifier.c \
        src/shared/specifier.h \
        src/shared/spawn-polkit-agent.c \
-       src/shared/spawn-polkit-agent.h \
-       src/shared/list.h \
-       src/shared/macro.h \
-       src/shared/ask-password-api.h
+       src/shared/spawn-polkit-agent.h
 
 libsystemd_shared_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
+#-------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-dbus.la
+
+libsystemd_dbus_la_SOURCES = \
+       src/shared/dbus-common.c \
+       src/shared/dbus-common.h \
+       src/shared/dbus-loop.c \
+       src/shared/dbus-loop.h \
+       src/shared/polkit.c \
+       src/shared/polkit.h
+
+libsystemd_dbus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+libsystemd_dbus_la_LIBADD = \
+       $(DBUS_LIBS)
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-label.la
@@ -596,7 +614,9 @@ libsystemd_label_la_SOURCES = \
        src/shared/label.c \
        src/shared/label.h \
        src/shared/mkdir.c \
-       src/shared/mkdir.h
+       src/shared/mkdir.h \
+       src/shared/ask-password-api.c \
+       src/shared/ask-password-api.h
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -654,7 +674,6 @@ noinst_LTLIBRARIES += \
        libsystemd-core.la
 
 libsystemd_core_la_SOURCES = \
-       src/def.h \
        src/core/unit.c \
        src/core/unit.h \
        src/core/job.c \
@@ -762,6 +781,7 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-label.la \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS) \
        $(LIBWRAP_LIBS) \
@@ -793,7 +813,8 @@ systemd_CFLAGS = \
 systemd_LDADD = \
        libsystemd-core.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la
+       libsystemd-id128.la \
+       libsystemd-dbus.la
 
 dist_pkgsysconf_DATA += \
        src/core/system.conf \
@@ -844,7 +865,8 @@ test_engine_CFLAGS = \
 
 test_engine_LDADD = \
        libsystemd-core.la \
-       libsystemd-daemon.la
+       libsystemd-daemon.la \
+       libsystemd-dbus.la
 
 test_job_type_SOURCES = \
        src/test/test-job-type.c
@@ -928,6 +950,7 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -941,6 +964,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
@@ -1013,6 +1037,7 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -1071,6 +1096,7 @@ systemd_cgroups_agent_CFLAGS = \
 
 systemd_cgroups_agent_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1087,6 +1113,7 @@ systemctl_LDADD = \
        libsystemd-daemon.la \
        libsystemd-journal.la \
        libsystemd-id128.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1100,8 +1127,7 @@ systemd_notify_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
-       src/ask-password.c \
-       src/ask-password-api.c
+       src/ask-password.c
 
 systemd_ask_password_LDADD = \
        libsystemd-label.la \
@@ -1147,8 +1173,7 @@ systemd_stdio_bridge_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
-       src/tty-ask-password-agent.c \
-       src/ask-password-api.c
+       src/tty-ask-password-agent.c
 
 systemd_tty_ask_password_agent_LDADD = \
        libsystemd-label.la \
@@ -1156,7 +1181,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
+       src/libsystemd-daemon/sd-daemon.c
 
 libsystemd_daemon_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1167,7 +1192,7 @@ libsystemd_daemon_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
        src/systemd/sd-daemon.h
@@ -1195,7 +1220,7 @@ lib_LTLIBRARIES += \
        libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
-       src/libsystemd-daemon.pc
+       src/libsystemd-daemon/libsystemd-daemon.pc
 
 MANPAGES += \
        man/sd-daemon.7 \
@@ -1218,8 +1243,8 @@ man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
 
 EXTRA_DIST += \
-       src/libsystemd-daemon.pc.in \
-       src/libsystemd-daemon.sym
+       src/libsystemd-daemon/libsystemd-daemon.pc.in \
+       src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
 SUBDIRS += \
@@ -1857,7 +1882,7 @@ udevlibexec_PROGRAMS += \
 
 # ------------------------------------------------------------------------------
 libsystemd_id128_la_SOURCES = \
-       src/sd-id128.c
+       src/libsystemd-id128/sd-id128.c
 
 libsystemd_id128_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1867,7 +1892,7 @@ libsystemd_id128_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la
@@ -1889,7 +1914,7 @@ lib_LTLIBRARIES += \
        libsystemd-id128.la
 
 pkgconfiglib_DATA += \
-       src/libsystemd-id128.pc
+       src/libsystemd-id128/libsystemd-id128.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
@@ -1911,8 +1936,8 @@ UNINSTALL_EXEC_HOOKS += \
        libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-       src/libsystemd-id128.pc.in \
-       src/libsystemd-id128.sym
+       src/libsystemd-id128/libsystemd-id128.pc.in \
+       src/libsystemd-id128/libsystemd-id128.sym
 
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
@@ -2327,8 +2352,7 @@ dist_systemunit_DATA += \
        units/cryptsetup.target
 
 systemd_cryptsetup_SOURCES = \
-       src/cryptsetup/cryptsetup.c \
-       src/ask-password-api.c
+       src/cryptsetup/cryptsetup.c
 
 systemd_cryptsetup_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2361,9 +2385,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
-       src/hostname/hostnamed.c \
-       src/polkit.c \
-       src/polkit.h
+       src/hostname/hostnamed.c
 
 systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2372,6 +2394,7 @@ systemd_hostnamed_CFLAGS = \
 systemd_hostnamed_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 rootlibexec_PROGRAMS += \
@@ -2412,9 +2435,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-       src/locale/localed.c \
-       src/polkit.c \
-       src/polkit.h
+       src/locale/localed.c
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2424,6 +2445,7 @@ systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 nodist_systemunit_DATA += \
@@ -2474,9 +2496,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
-       src/timedate/timedated.c \
-       src/polkit.c \
-       src/polkit.h
+       src/timedate/timedated.c
 
 systemd_timedated_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2485,6 +2505,7 @@ systemd_timedated_CFLAGS = \
 systemd_timedated_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 rootlibexec_PROGRAMS += \
@@ -2539,10 +2560,6 @@ systemd_logind_SOURCES = \
        src/login/logind-session-dbus.c \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
-       src/dbus-loop.c \
-       src/dbus-loop.h \
-       src/polkit.c \
-       src/polkit.h \
        src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
@@ -2557,6 +2574,7 @@ systemd_logind_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -2588,6 +2606,7 @@ loginctl_CFLAGS = \
 
 loginctl_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS)