hostnamed: move sources to subdirectory

diff --git a/Makefile.am b/Makefile.am
index cc28e2abb5b2aa7cc78da0af61df00d817d167a1..c6a25a78e172bc61ab60ae8707378163aa8f91da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -202,11 +202,6 @@ rootlibexec_PROGRAMS += \
        systemd-binfmt
 endif
 
-if ENABLE_HOSTNAMED
-rootlibexec_PROGRAMS += \
-       systemd-hostnamed
-endif
-
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
@@ -428,11 +423,6 @@ nodist_systemunit_DATA += \
        units/systemd-binfmt.service
 endif
 
-if ENABLE_HOSTNAMED
-nodist_systemunit_DATA += \
-       units/systemd-hostnamed.service
-endif
-
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -492,11 +482,6 @@ EXTRA_DIST += \
        units/systemd-binfmt.service.in
 endif
 
-if ENABLE_HOSTNAMED
-EXTRA_DIST += \
-       units/systemd-hostnamed.service.in
-endif
-
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
@@ -1100,8 +1085,10 @@ dist_pkgdata_DATA = \
 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
 
@@ -1114,6 +1101,29 @@ systemd_hostnamed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+
+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 = \
@@ -2040,11 +2050,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
-
 CLEANFILES += \
        $(dbusinterface_DATA)
 
@@ -2195,11 +2200,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
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \

diff --git a/po/.gitignore b/po/.gitignore
index ee1215654d7c15a1d2ad0c59e1b934e0164bf90c..1fa8d3fd56d4ec881a83403671d928d655eae131 100644 (file)
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -2,3 +2,4 @@ POTFILES
 Makefile.in.in
 .intltool-merge-cache
 Makefile
+systemd.pot

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 10d61410fefd6cdb855c83e7f159143006e6a1f7..5a5d027493c48ff1ffc98e6d693e3322c77c67be 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -11,7 +11,7 @@ src/dbus-swap.c
 src/dbus-target.c
 src/dbus-timer.c
 src/dbus-unit.c
-src/hostnamed.c
+src/hostname/hostnamed.c
 src/locale/localed.c
 src/org.freedesktop.systemd1.policy.in.in
 src/timedate/timedated.c

diff --git a/src/hostnamed.c b/src/hostname/hostnamed.c
similarity index 100%
rename from src/hostnamed.c
rename to src/hostname/hostnamed.c