build-sys: move remaining headers out EXTRA_DIST, install sd-readahead.h

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0aebeb2d9809dcdc4101cba2b10f05d11ada5608..6d27b7d0da7e740803ca2568dab3e4fdd27d3eb2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -761,7 +761,6 @@ libsystemd_core_la_SOURCES = \
        src/bus-errors.h \
        src/cgroup-show.h \
        src/build.h \
-       src/shutdownd.h \
        src/umount.h \
        src/ask-password-api.h \
        src/sysfs-show.h \
@@ -934,9 +933,13 @@ systemd_shutdownd_SOURCES = \
        src/shutdownd.c
 
 systemd_shutdownd_LDADD = \
-       libsystemd-shared.la \
+       libsystemd-shared-selinux.la \
        libsystemd-daemon.la
 
+pkginclude_HEADERS += \
+       src/systemd/sd-shutdown.h
+
+# ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -1153,6 +1156,7 @@ libsystemd_daemon_la_CFLAGS = \
        -DSD_EXPORT_SYMBOLS
 
 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
@@ -1608,6 +1612,7 @@ libgudev_1_0_la_LIBADD = \
        $(GLIB_LIBS)
 
 libgudev_1_0_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
        -export-dynamic -no-undefined \
        -export-symbols-regex '^g_udev_.*'
@@ -1847,6 +1852,7 @@ libsystemd_id128_la_CFLAGS = \
        -fvisibility=hidden
 
 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
@@ -1899,11 +1905,18 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
        src/journal/journald.c \
+       src/journal/journald.h \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
+       src/journal/journal-file.h \
        src/journal/lookup3.c \
+       src/journal/lookup3.h \
        src/journal/journal-rate-limit.c \
-       src/journal/sparse-endian.h
+       src/journal/journal-rate-limit.h \
+       src/journal/sparse-endian.h \
+       src/journal/journal-def.h \
+       src/journal/journal-internal.h \
+       src/journal/compress.h
 
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
@@ -2001,6 +2014,7 @@ libsystemd_journal_la_CFLAGS = \
        -fvisibility=hidden
 
 libsystemd_journal_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
@@ -2087,13 +2101,6 @@ INSTALL_DATA_HOOKS += \
        journal-install-data-hook
 
 EXTRA_DIST += \
-       src/journal/journald.h \
-       src/journal/journal-def.h \
-       src/journal/journal-internal.h \
-       src/journal/journal-file.h \
-       src/journal/lookup3.h \
-       src/journal/compress.h \
-       src/journal/journal-rate-limit.h \
        src/journal/libsystemd-journal.pc.in \
        src/journal/libsystemd-journal.sym \
        units/systemd-journald.service.in \
@@ -2199,7 +2206,8 @@ endif
 if ENABLE_READAHEAD
 systemd_readahead_collect_SOURCES = \
        src/readahead/readahead-collect.c \
-       src/readahead/readahead-common.c
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
 
 systemd_readahead_collect_LDADD = \
        libsystemd-shared.la \
@@ -2215,6 +2223,9 @@ systemd_readahead_replay_LDADD = \
        libsystemd-daemon.la \
        libudev.la
 
+pkginclude_HEADERS += \
+       src/systemd/sd-readahead.h
+
 rootlibexec_PROGRAMS += \
        systemd-readahead-collect \
        systemd-readahead-replay
@@ -2228,8 +2239,6 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-       src/systemd/sd-readahead.h \
-       src/readahead/readahead-common.h \
        units/systemd-readahead-collect.service.in \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in
@@ -2500,17 +2509,23 @@ endif
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
        src/login/logind.c \
+       src/login/logind.h \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
+       src/login/logind-device.h \
        src/login/logind-seat.c \
-       src/login/logind-seat-dbus.c \
+       src/login/logind-seat.h \
        src/login/logind-session.c \
-       src/login/logind-session-dbus.c \
+       src/login/logind-session.h \
        src/login/logind-user.c \
+       src/login/logind-user.h \
+       src/login/logind-session-dbus.c \
+       src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
        src/dbus-common.c \
        src/dbus-loop.c \
-       src/polkit.c
+       src/polkit.c \
+       src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
        src/login/logind-gperf.c
@@ -2580,6 +2595,7 @@ libsystemd_login_la_CFLAGS = \
        -fvisibility=hidden
 
 libsystemd_login_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
@@ -2599,6 +2615,7 @@ pam_systemd_la_CFLAGS = \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -module \
        -export-dynamic \
        -avoid-version \
@@ -2606,8 +2623,9 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-       libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-audit.la \
+       libsystemd-shared-selinux.la \
        $(PAM_LIBS) \
        $(DBUS_LIBS)
 
@@ -2745,12 +2763,6 @@ EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
-       src/login/logind.h \
-       src/login/logind-device.h \
-       src/login/logind-seat.h \
-       src/login/logind-session.h \
-       src/login/logind-user.h \
-       src/login/logind-acl.h \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
        units/systemd-user-sessions.service.in