move pager.[ch] to shared/

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 39299e2feb0ca4dc870dfe8a38457d474608c5b7..a8f2150bbadaeaeddadd6a03623dca9c79298964 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,6 +84,7 @@ INSTALL_DATA_HOOKS =
 DISTCHECK_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
+noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
@@ -233,7 +234,7 @@ noinst_PROGRAMS = \
        test-env-replace \
        test-strv \
        test-install \
-        test-watchdog
+       test-watchdog
 
 dist_pkgsysconf_DATA = \
        src/system.conf \
@@ -549,12 +550,8 @@ EXTRA_DIST += \
        $(MANPAGES_ALIAS)
 
 # ------------------------------------------------------------------------------
-noinst_LTLIBRARIES = \
-       libsystemd-basic.la \
-       libsystemd-capability.la \
-       libsystemd-audit.la \
-       libsystemd-acl.la \
-       libsystemd-core.la
+noinst_LTLIBRARIES += \
+       libsystemd-basic.la
 
 libsystemd_basic_la_SOURCES = \
        src/shared/util.c \
@@ -580,17 +577,23 @@ libsystemd_basic_la_SOURCES = \
        src/shared/exit-status.c \
        src/shared/exit-status.h \
        src/shared/utf8.c \
-       src/shared/utf8.h
+       src/shared/utf8.h \
+       src/shared/cgroup-util.c \
+       src/shared/cgroup-util.h \
+       src/shared/pager.c \
+       src/shared/pager.h
 
 libsystemd_basic_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-       libsystemd-capability.la \
        $(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-capability.la
+
 libsystemd_capability_la_SOURCES = \
        src/shared/capability.c \
        src/shared/capability.h
@@ -603,6 +606,9 @@ libsystemd_capability_la_LIBADD = \
        $(CAP_LIBS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-audit.la
+
 libsystemd_audit_la_SOURCES = \
        src/shared/audit.c \
        src/shared/audit.h
@@ -611,6 +617,9 @@ libsystemd_audit_la_LIBADD = \
        libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-acl.la
+
 libsystemd_acl_la_SOURCES = \
        src/shared/acl.c \
        src/shared/acl.h
@@ -623,6 +632,9 @@ libsystemd_acl_la_LIBADD = \
        $(ACL_LIBS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-core.la
+
 libsystemd_core_la_SOURCES = \
        src/unit.c \
        src/unit.h \
@@ -710,8 +722,6 @@ libsystemd_core_la_SOURCES = \
        src/machine-id-setup.h \
        src/fdset.c \
        src/fdset.h \
-       src/cgroup-util.c \
-       src/cgroup-util.h \
        src/condition.c \
        src/condition.h \
        src/dbus-common.c \
@@ -730,8 +740,6 @@ libsystemd_core_la_SOURCES = \
        src/cgroup-attr.h \
        src/watchdog.c \
        src/watchdog.h \
-       src/sd-daemon.c \
-       src/sd-id128.c \
        src/macro.h \
        src/def.h \
        src/ioprio.h \
@@ -749,7 +757,6 @@ libsystemd_core_la_SOURCES = \
        src/shutdownd.h \
        src/umount.h \
        src/ask-password-api.h \
-       src/pager.h \
        src/sysfs-show.h \
        src/polkit.h \
        src/dbus-loop.h \
@@ -773,6 +780,7 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
+       libsystemd-capability.la \
        libudev.la \
        $(DBUS_LIBS) \
        $(LIBWRAP_LIBS) \
@@ -790,7 +798,9 @@ systemd_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_LDADD = \
-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la \
+       libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
 test_engine_SOURCES = \
@@ -801,7 +811,8 @@ test_engine_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_engine_LDADD = \
-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la
 
 test_job_type_SOURCES = \
        src/test-job-type.c
@@ -841,8 +852,7 @@ test_daemon_LDADD = \
        libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-       src/test-cgroup.c \
-       src/cgroup-util.c
+       src/test-cgroup.c
 
 test_cgroup_LDADD = \
        libsystemd-basic.la
@@ -953,11 +963,11 @@ systemd_tmpfiles_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup.c \
-       src/machine-id-main.c \
-       src/sd-id128.c
+       src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
@@ -1045,9 +1055,7 @@ systemctl_SOURCES = \
        src/dbus-common.c \
        src/path-lookup.c \
        src/cgroup-show.c \
-       src/cgroup-util.c \
        src/unit-name.c \
-       src/pager.c \
        src/install.c \
        src/spawn-agent.c \
        src/logs-show.c
@@ -1090,17 +1098,14 @@ systemd_reply_password_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
        src/cgls.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c
+       src/cgroup-show.c
 
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
 # ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
-       src/cgtop.c \
-        src/cgroup-util.c
+       src/cgtop.c
 
 systemd_cgtop_LDADD = \
        libsystemd-basic.la
@@ -1108,7 +1113,6 @@ systemd_cgtop_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
-       src/cgroup-util.c \
        src/loopback-setup.c
 
 systemd_nspawn_LDADD = \
@@ -1208,9 +1212,6 @@ include_HEADERS += \
 lib_LTLIBRARIES += \
        libudev.la
 
-noinst_LTLIBRARIES += \
-       libudev-private.la
-
 libudev_la_SOURCES =\
        src/udev/libudev-private.h \
        src/udev/libudev.c \
@@ -1221,24 +1222,14 @@ libudev_la_SOURCES =\
        src/udev/libudev-monitor.c \
        src/udev/libudev-queue.c
 
+libudev_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden
+
 libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
-libudev_private_la_SOURCES =\
-       $(libudev_la_SOURCES) \
-       src/udev/libudev-util-private.c \
-       src/udev/libudev-device-private.c \
-       src/udev/libudev-queue-private.c
-
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
-       src/udev/libudev-selinux-private.c
-endif
-
-libudev_private_la_LIBADD = \
-       $(SELINUX_LIBS)
-
 pkgconfiglib_DATA += \
        src/udev/libudev.pc
 
@@ -1264,6 +1255,28 @@ libudev-uninstall-move-hook:
 INSTALL_EXEC_HOOKS += libudev-install-move-hook
 UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libudev-private.la
+
+libudev_private_la_SOURCES =\
+       $(libudev_la_SOURCES) \
+       src/udev/libudev-util-private.c \
+       src/udev/libudev-device-private.c \
+       src/udev/libudev-queue-private.c
+
+libudev_private_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=default
+
+if HAVE_SELINUX
+libudev_private_la_SOURCES +=\
+       src/udev/libudev-selinux-private.c
+
+libudev_private_la_LIBADD = \
+       $(SELINUX_LIBS)
+endif
+
 # ------------------------------------------------------------------------------
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1328,7 +1341,10 @@ bin_PROGRAMS += \
 udevlibexec_PROGRAMS = \
        udevd
 
-udev_common_sources = \
+noinst_LTLIBRARIES += \
+       libudev-core.la
+
+libudev_core_la_SOURCES = \
        src/udev/udev.h \
        src/udev/udev-event.c \
        src/udev/udev-watch.c \
@@ -1342,51 +1358,42 @@ udev_common_sources = \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-kmod.c \
        src/udev/udev-builtin-path_id.c \
-       src/udev/udev-builtin-usb_id.c \
-       src/systemd/sd-daemon.h \
-       src/sd-daemon.c
+       src/udev/udev-builtin-usb_id.c
 
-udev_common_CFLAGS = \
+libudev_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(BLKID_CFLAGS) \
        $(KMOD_CFLAGS)
 
-udev_common_LDADD = \
+libudev_core_la_LIBADD = \
        libudev-private.la \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
-udev_common_CPPFLAGS = \
+libudev_core_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
        -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
 
 if HAVE_ACL
-udev_common_sources += \
+libudev_core_la_SOURCES += \
        src/udev/udev-builtin-uaccess.c \
        src/login/logind-acl.c
 
-udev_common_LDADD += \
+libudev_core_la_LIBADD += \
        libsystemd-login.la \
        libsystemd-acl.la
 endif
 
 udevd_SOURCES = \
-       $(udev_common_sources) \
        src/udev/udevd.c
 
-udevd_CFLAGS = \
-       $(udev_common_CFLAGS)
-
 udevd_LDADD = \
-       $(udev_common_LDADD) \
-       libsystemd-basic.la
-
-udevd_CPPFLAGS = \
-       $(udev_common_CPPFLAGS)
+       libudev-core.la
 
 udevadm_SOURCES = \
-       $(udev_common_sources) \
        src/udev/udevadm.c \
        src/udev/udevadm-info.c \
        src/udev/udevadm-control.c \
@@ -1396,15 +1403,8 @@ udevadm_SOURCES = \
        src/udev/udevadm-test.c \
        src/udev/udevadm-test-builtin.c
 
-udevadm_CFLAGS = \
-       $(udev_common_CFLAGS)
-
 udevadm_LDADD = \
-       $(udev_common_LDADD) \
-       libsystemd-basic.la
-
-udevadm_CPPFLAGS = \
-       $(udev_common_CPPFLAGS)
+       libudev-core.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1422,19 +1422,13 @@ test_libudev_LDADD = \
        libudev.la
 
 test_udev_SOURCES = \
-       $(udev_common_sources) \
        src/udev/test-udev.c
 
-test_udev_CFLAGS = \
-       $(udev_common_CFLAGS)
-
 test_udev_LDADD = \
-       $(udev_common_LDADD) \
+       libudev-core.la \
+       libudev-private.la \
        libsystemd-basic.la
 
-test_udev_CPPFLAGS = \
-       $(udev_common_CPPFLAGS)
-
 test_udev_DEPENDENCIES = \
        src/udev/test/sys
 
@@ -1467,7 +1461,7 @@ cdrom_id_SOURCES = \
        src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-       libudev-private.la \
+       libudev.la \
        libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
@@ -1508,7 +1502,7 @@ v4l_id_SOURCES = \
        src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-       libudev-private.la
+       libudev.la
 
 udevlibexec_PROGRAMS += \
        v4l_id
@@ -1521,7 +1515,7 @@ accelerometer_SOURCES = \
        src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-       libudev-private.la -lm \
+       libudev.la -lm \
        libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
@@ -1847,11 +1841,11 @@ libsystemd_id128_la_LIBADD = \
        libsystemd-basic.la
 
 test_id128_SOURCES = \
-       src/test-id128.c \
-       src/sd-id128.c
+       src/test-id128.c
 
 test_id128_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-id128.la
 
 noinst_PROGRAMS += \
        test-id128
@@ -1895,9 +1889,7 @@ systemd_journald_SOURCES = \
        src/journal/journal-file.c \
        src/journal/lookup3.c \
        src/journal/journal-rate-limit.c \
-       src/journal/sparse-endian.h \
-       src/sd-id128.c \
-       src/cgroup-util.c
+       src/journal/sparse-endian.h
 
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
@@ -1908,7 +1900,8 @@ systemd_journald_LDADD = \
        libsystemd-basic.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-login.la
+       libsystemd-login.la \
+       libsystemd-id128.la
 
 if HAVE_ACL
 systemd_journald_LDADD += \
@@ -1936,7 +1929,6 @@ systemd_cat_LDADD = \
 
 journalctl_SOURCES = \
        src/journal/journalctl.c \
-       src/pager.c \
        src/logs-show.c
 
 journalctl_LDADD = \
@@ -1959,11 +1951,11 @@ test_journal_SOURCES = \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
        src/journal/lookup3.c \
-       src/journal/journal-send.c \
-       src/sd-id128.c
+       src/journal/journal-send.c
 
 test_journal_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-id128.la
 
 if HAVE_XZ
 test_journal_SOURCES += \
@@ -2504,7 +2496,6 @@ systemd_logind_SOURCES = \
        src/login/logind-user-dbus.c \
        src/dbus-common.c \
        src/dbus-loop.c \
-       src/cgroup-util.c \
        src/polkit.c
 
 nodist_systemd_logind_SOURCES = \
@@ -2530,8 +2521,7 @@ systemd_logind_LDADD += \
 endif
 
 systemd_user_sessions_SOURCES = \
-       src/login/user-sessions.c \
-       src/cgroup-util.c
+       src/login/user-sessions.c
 
 systemd_user_sessions_LDADD = \
        libsystemd-basic.la
@@ -2544,9 +2534,7 @@ loginctl_SOURCES = \
        src/login/loginctl.c \
        src/login/sysfs-show.c \
        src/dbus-common.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c
+       src/cgroup-show.c
 
 loginctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2571,8 +2559,7 @@ noinst_PROGRAMS += \
        test-login
 
 libsystemd_login_la_SOURCES = \
-       src/login/sd-login.c \
-       src/cgroup-util.c
+       src/login/sd-login.c
 
 libsystemd_login_la_CFLAGS = \
        $(AM_CFLAGS) \