summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-31 06:50:34 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-12-31 06:50:34 +0100
commit1822350db15b089f094a6dbd2469842ab42c1d87 (patch)
tree97303b670001b76f9c0e60c887801545e6ad57cc /Makefile.am
parent4668191d0298339c70fba485f46233f79fcedc30 (diff)
localed: move sources to subdirectory
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am60
1 files changed, 30 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am
index 3440e68ea4..cc28e2abb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,11 +207,6 @@ rootlibexec_PROGRAMS += \
systemd-hostnamed
endif
-if ENABLE_LOCALED
-rootlibexec_PROGRAMS += \
- systemd-localed
-endif
-
systemgenerator_PROGRAMS = \
systemd-getty-generator
@@ -438,11 +433,6 @@ 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
@@ -507,11 +497,6 @@ 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 \
@@ -1109,6 +1094,12 @@ systemd_shutdownd_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
+dist_pkgdata_DATA = \
+ src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+ src/generate-kbd-model-map
+
systemd_hostnamed_SOURCES = \
src/hostnamed.c \
src/dbus-common.c \
@@ -1123,8 +1114,10 @@ systemd_hostnamed_LDADD = \
libsystemd-daemon.la \
$(DBUS_LIBS)
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
systemd_localed_SOURCES = \
- src/localed.c \
+ src/locale/localed.c \
src/dbus-common.c \
src/polkit.c
@@ -1137,11 +1130,28 @@ 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
+
+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
@@ -2035,11 +2045,6 @@ org.freedesktop.hostname1.xml: systemd-hostnamed
$(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)
@@ -2196,11 +2201,6 @@ if ENABLE_HOSTNAMED
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 && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )