hostname-setup: move to core/

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a12d89b5e25681294e3ddc7281245d414533d4a..74efb0cf626fb744ec1f6cb4064c1a1badee7c4d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#
 #  This file is part of systemd.
 #
 #  Copyright 2010-2012 Lennart Poettering
@@ -123,9 +125,7 @@ AM_CPPFLAGS = \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
-       -I $(top_srcdir)/src/readahead \
        -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
@@ -556,6 +556,9 @@ noinst_LTLIBRARIES += \
        libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
+       src/missing.h \
+       src/linux/auto_dev-ioctl.h \
+       src/linux/fanotify.h \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/virt.c \
@@ -585,8 +588,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/cgroup-util.h \
        src/shared/dbus-common.c \
        src/shared/dbus-common.h \
-       src/shared/hostname-setup.c \
-       src/shared/hostname-setup.h \
        src/shared/logs-show.c \
        src/shared/logs-show.h \
        src/shared/cgroup-show.c \
@@ -597,8 +598,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/utmp-wtmp.h \
        src/shared/watchdog.c \
        src/shared/watchdog.h \
-       src/shared/umount.c \
-       src/shared/umount.h \
        src/shared/spawn-ask-password-agent.c \
        src/shared/spawn-ask-password-agent.h \
        src/shared/mount-setup.c \
@@ -612,7 +611,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/list.h \
-       src/shared/macro.h
+       src/shared/macro.h \
+       src/shared/ask-password-api.h
 
 libsystemd_shared_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -691,9 +691,6 @@ noinst_LTLIBRARIES += \
 
 libsystemd_core_la_SOURCES = \
        src/def.h \
-       src/missing.h \
-       src/linux/auto_dev-ioctl.h \
-       src/linux/fanotify.h \
        src/core/unit.c \
        src/core/unit.h \
        src/core/job.c \
@@ -766,6 +763,8 @@ libsystemd_core_la_SOURCES = \
        src/core/kmod-setup.h \
        src/core/locale-setup.h \
        src/core/locale-setup.c \
+       src/core/hostname-setup.c \
+       src/core/hostname-setup.h \
        src/core/fdset.c \
        src/core/fdset.h \
        src/core/condition.c \
@@ -781,10 +780,7 @@ libsystemd_core_la_SOURCES = \
        src/core/special.h \
        src/core/bus-errors.h \
        src/core/build.h \
-       src/core/ask-password-api.h \
-       src/core/sysfs-show.h \
-       src/core/polkit.h \
-       src/core/dbus-loop.h
+       src/core/sysfs-show.h
 
 nodist_libsystemd_core_la_SOURCES = \
        src/load-fragment-gperf.c \
@@ -828,7 +824,7 @@ systemd_LDADD = \
 
 # ------------------------------------------------------------------------------
 test_engine_SOURCES = \
-       test/test-engine.c
+       src/test/test-engine.c
 
 test_engine_CFLAGS = \
        $(AM_CFLAGS) \
@@ -839,7 +835,7 @@ test_engine_LDADD = \
        libsystemd-daemon.la
 
 test_job_type_SOURCES = \
-       test/test-job-type.c
+       src/test/test-job-type.c
 
 test_job_type_CFLAGS = \
        $(AM_CFLAGS) \
@@ -849,51 +845,51 @@ test_job_type_LDADD = \
        libsystemd-core.la
 
 test_ns_SOURCES = \
-       test/test-ns.c
+       src/test/test-ns.c
 
 test_ns_LDADD = \
        libsystemd-core.la
 
 test_loopback_SOURCES = \
-       test/test-loopback.c
+       src/test/test-loopback.c
 
 test_loopback_LDADD = \
        libsystemd-shared.la
 
 test_hostname_SOURCES = \
-       test/test-hostname.c
+       src/test/test-hostname.c
 
 test_hostname_LDADD = \
-       libsystemd-shared.la
+       libsystemd-core.la
 
 test_daemon_SOURCES = \
-       test/test-daemon.c
+       src/test/test-daemon.c
 
 test_daemon_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-       test/test-cgroup.c
+       src/test/test-cgroup.c
 
 test_cgroup_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
 test_env_replace_SOURCES = \
-       test/test-env-replace.c
+       src/test/test-env-replace.c
 
 test_env_replace_LDADD = \
        libsystemd-shared.la
 
 test_strv_SOURCES = \
-       test/test-strv.c
+       src/test/test-strv.c
 
 test_strv_LDADD = \
        libsystemd-shared.la
 
 test_install_SOURCES = \
-       test/test-install.c
+       src/test/test-install.c
 
 test_install_CFLAGS = \
        $(AM_CFLAGS) \
@@ -904,7 +900,7 @@ test_install_LDADD = \
        libsystemd-shared.la
 
 test_watchdog_SOURCES = \
-       test/test-watchdog.c
+       src/test/test-watchdog.c
 
 test_watchdog_LDADD = \
        libsystemd-shared.la
@@ -950,7 +946,9 @@ pkginclude_HEADERS += \
 
 # ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
-       src/shutdown.c
+       src/core/umount.c \
+       src/core/umount.h \
+       src/core/shutdown.c
 
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
@@ -1863,7 +1861,7 @@ libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la
 
 test_id128_SOURCES = \
-       test/test-id128.c
+       src/test/test-id128.c
 
 test_id128_LDADD = \
        libsystemd-shared.la \
@@ -2352,7 +2350,8 @@ endif
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
        src/hostname/hostnamed.c \
-       src/polkit.c
+       src/polkit.c \
+       src/polkit.h
 
 systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2402,7 +2401,8 @@ endif
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
        src/locale/localed.c \
-       src/polkit.c
+       src/polkit.c \
+       src/polkit.h
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2463,7 +2463,8 @@ endif
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
        src/timedate/timedated.c \
-       src/polkit.c
+       src/polkit.c \
+       src/polkit.h
 
 systemd_timedated_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2527,7 +2528,9 @@ systemd_logind_SOURCES = \
        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 = \