chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
hostnamed, localed: move config files to subdir
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 3440e68ea411a0f035c47a2bf13ced388245dd4b..299b9e5e68e39a409cb80c457e2cc846c6c52772 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -202,16 +202,6 @@ rootlibexec_PROGRAMS += \
        systemd-binfmt
 endif
 
-if ENABLE_HOSTNAMED
-rootlibexec_PROGRAMS += \
-       systemd-hostnamed
-endif
-
-if ENABLE_LOCALED
-rootlibexec_PROGRAMS += \
-       systemd-localed
-endif
-
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
@@ -259,29 +249,9 @@ dist_pkgsysconf_DATA = \
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf
 
-if ENABLE_HOSTNAMED
-dist_dbuspolicy_DATA += \
-       src/org.freedesktop.hostname1.conf
-endif
-
-if ENABLE_LOCALED
-dist_dbuspolicy_DATA += \
-       src/org.freedesktop.locale1.conf
-endif
-
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service
 
-if ENABLE_HOSTNAMED
-dist_dbussystemservice_DATA += \
-       src/org.freedesktop.hostname1.service
-endif
-
-if ENABLE_LOCALED
-dist_dbussystemservice_DATA += \
-       src/org.freedesktop.locale1.service
-endif
-
 dist_udevrules_DATA = \
        src/71-seat.rules
 
@@ -304,16 +274,6 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml
 
-if ENABLE_HOSTNAMED
-dbusinterface_DATA += \
-       org.freedesktop.hostname1.xml
-endif
-
-if ENABLE_LOCALED
-dbusinterface_DATA += \
-       org.freedesktop.locale1.xml
-endif
-
 dist_bashcompletion_DATA = \
        src/systemd-bash-completion.sh
 
@@ -433,16 +393,6 @@ nodist_systemunit_DATA += \
        units/systemd-binfmt.service
 endif
 
-if ENABLE_HOSTNAMED
-nodist_systemunit_DATA += \
-       units/systemd-hostnamed.service
-endif
-
-if ENABLE_LOCALED
-nodist_systemunit_DATA += \
-       units/systemd-localed.service
-endif
-
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -502,16 +452,6 @@ EXTRA_DIST += \
        units/systemd-binfmt.service.in
 endif
 
-if ENABLE_HOSTNAMED
-EXTRA_DIST += \
-       units/systemd-hostnamed.service.in
-endif
-
-if ENABLE_LOCALED
-EXTRA_DIST += \
-       units/systemd-localed.service.in
-endif
-
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
@@ -588,16 +528,6 @@ pkgconfiglib_DATA = \
        libsystemd-id128.pc \
        libsystemd-journal.pc
 
-if ENABLE_HOSTNAMED
-polkitpolicy_in_files += \
-       src/org.freedesktop.hostname1.policy.in
-endif
-
-if ENABLE_LOCALED
-polkitpolicy_in_files += \
-       src/org.freedesktop.locale1.policy.in
-endif
-
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
        src/org.freedesktop.systemd1.policy.in.in
@@ -1109,8 +1039,16 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
+dist_pkgdata_DATA = \
+       src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+       src/generate-kbd-model-map
+
+# ------------------------------------------------------------------------------
+if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
-       src/hostnamed.c \
+       src/hostname/hostnamed.c \
        src/dbus-common.c \
        src/polkit.c
 
@@ -1123,8 +1061,45 @@ systemd_hostnamed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+
+dist_dbuspolicy_DATA += \
+       src/hostname/org.freedesktop.hostname1.conf
+
+dist_dbussystemservice_DATA += \
+       src/hostname/org.freedesktop.hostname1.service
+
+polkitpolicy_in_files += \
+       src/hostname/org.freedesktop.hostname1.policy.in
+
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+
+org.freedesktop.hostname1.xml: systemd-hostnamed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+hostnamed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.hostname1.service && \
+               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+
+INSTALL_DATA_HOOKS += \
+       hostnamed-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-       src/localed.c \
+       src/locale/localed.c \
        src/dbus-common.c \
        src/polkit.c
 
@@ -1137,11 +1112,40 @@ systemd_localed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
-dist_pkgdata_DATA = \
-       src/kbd-model-map
+nodist_systemunit_DATA += \
+       units/systemd-localed.service
 
-dist_noinst_SCRIPT = \
-       src/generate-kbd-model-map
+rootlibexec_PROGRAMS += \
+       systemd-localed
+
+dist_dbuspolicy_DATA += \
+       src/locale/org.freedesktop.locale1.conf
+
+dist_dbussystemservice_DATA += \
+       src/locale/org.freedesktop.locale1.service
+
+polkitpolicy_in_files += \
+       src/locale/org.freedesktop.locale1.policy.in
+
+dbusinterface_DATA += \
+       org.freedesktop.locale1.xml
+
+org.freedesktop.locale1.xml: systemd-localed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+localed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.locale1.service && \
+               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
+
+INSTALL_DATA_HOOKS += \
+       localed-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
@@ -2030,16 +2034,6 @@ org.freedesktop.systemd1.%.xml: systemd
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
-org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 CLEANFILES += \
        $(dbusinterface_DATA)
 
@@ -2190,16 +2184,6 @@ if ENABLE_BINFMT
                        proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
-endif
-if ENABLE_HOSTNAMED
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.hostname1.service && \
-               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
-endif
-if ENABLE_LOCALED
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.locale1.service && \
-               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
 endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
Unnamed repository; edit this file 'description' to name the repository.