picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timedated: move sources to subdirectory

This commit is contained in:
Kay Sievers 2011-12-31 06:20:34 +01:00
parent 2a018e83de
commit 4668191d02
8 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -8,15 +8,15 @@ test-journal
test-install
org.freedesktop.hostname1.xml
org.freedesktop.locale1.xml
org.freedesktop.timedate1.xml
libsystemd-daemon.pc
libsystemd-login.pc
test-login
systemd-loginctl
systemd-localed
systemd-timedated
systemd-uaccess
org.freedesktop.timedate1.xml
systemd-logind
systemd-uaccess
systemd-hostnamed
systemd-binfmt
systemd-getty-generator

88
Makefile.am
View File

@ -207,11 +207,6 @@ rootlibexec_PROGRAMS += \
systemd-hostnamed
endif
if ENABLE_TIMEDATED
rootlibexec_PROGRAMS += \
systemd-timedated
endif
if ENABLE_LOCALED
rootlibexec_PROGRAMS += \
systemd-localed
@ -269,11 +264,6 @@ dist_dbuspolicy_DATA += \
src/org.freedesktop.hostname1.conf
endif
if ENABLE_TIMEDATED
dist_dbuspolicy_DATA += \
src/org.freedesktop.timedate1.conf
endif
if ENABLE_LOCALED
dist_dbuspolicy_DATA += \
src/org.freedesktop.locale1.conf
@ -287,11 +277,6 @@ dist_dbussystemservice_DATA += \
src/org.freedesktop.hostname1.service
endif
if ENABLE_TIMEDATED
dist_dbussystemservice_DATA += \
src/org.freedesktop.timedate1.service
endif
if ENABLE_LOCALED
dist_dbussystemservice_DATA += \
src/org.freedesktop.locale1.service
@ -324,11 +309,6 @@ dbusinterface_DATA += \
org.freedesktop.hostname1.xml
endif
if ENABLE_TIMEDATED
dbusinterface_DATA += \
org.freedesktop.timedate1.xml
endif
if ENABLE_LOCALED
dbusinterface_DATA += \
org.freedesktop.locale1.xml
@ -458,11 +438,6 @@ nodist_systemunit_DATA += \
units/systemd-hostnamed.service
endif
if ENABLE_TIMEDATED
nodist_systemunit_DATA += \
units/systemd-timedated.service
endif
if ENABLE_LOCALED
nodist_systemunit_DATA += \
units/systemd-localed.service
@ -532,11 +507,6 @@ EXTRA_DIST += \
units/systemd-hostnamed.service.in
endif
if ENABLE_TIMEDATED
EXTRA_DIST += \
units/systemd-timedated.service.in
endif
if ENABLE_LOCALED
EXTRA_DIST += \
units/systemd-localed.service.in
@ -623,11 +593,6 @@ polkitpolicy_in_files += \
src/org.freedesktop.hostname1.policy.in
endif
if ENABLE_TIMEDATED
polkitpolicy_in_files += \
src/org.freedesktop.timedate1.policy.in
endif
if ENABLE_LOCALED
polkitpolicy_in_files += \
src/org.freedesktop.locale1.policy.in
@ -1178,8 +1143,10 @@ dist_pkgdata_DATA = \
dist_noinst_SCRIPT = \
src/generate-kbd-model-map
# ------------------------------------------------------------------------------
if ENABLE_TIMEDATED
systemd_timedated_SOURCES = \
src/timedated.c \
src/timedate/timedated.c \
src/dbus-common.c \
src/polkit.c
@ -1192,6 +1159,41 @@ systemd_timedated_LDADD = \
libsystemd-daemon.la \
$(DBUS_LIBS)
rootlibexec_PROGRAMS += \
systemd-timedated
dist_dbussystemservice_DATA += \
src/timedate/org.freedesktop.timedate1.service
dist_dbuspolicy_DATA += \
src/timedate/org.freedesktop.timedate1.conf
nodist_systemunit_DATA += \
units/systemd-timedated.service
polkitpolicy_in_files += \
src/timedate/org.freedesktop.timedate1.policy.in
org.freedesktop.timedate1.xml: systemd-timedated
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
dbusinterface_DATA += \
org.freedesktop.timedate1.xml
timedated-install-data-hook:
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.timedate1.service && \
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
INSTALL_DATA_HOOKS += \
timedated-install-data-hook
EXTRA_DIST += \
units/systemd-timedated.service.in
endif
# ------------------------------------------------------------------------------
if ENABLE_LOGIND
systemd_logind_SOURCES = \
@ -1328,7 +1330,7 @@ pkgconfiglib_DATA += \
polkitpolicy_in_files += \
src/login/org.freedesktop.login1.policy.in
logind-install-data:
logind-install-data-hook:
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@ -1337,7 +1339,7 @@ logind-install-data:
$(LN_S) ../systemd-logind.service systemd-logind.service )
INSTALL_DATA_HOOKS += \
logind-install-data
logind-install-data-hook
systemd_uaccess_SOURCES = \
src/login/uaccess.c
@ -2038,11 +2040,6 @@ org.freedesktop.locale1.xml: systemd-localed
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
org.freedesktop.timedate1.xml: systemd-timedated
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
CLEANFILES += \
$(dbusinterface_DATA)
@ -2199,11 +2196,6 @@ if ENABLE_HOSTNAMED
rm -f dbus-org.freedesktop.hostname1.service && \
$(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
endif
if ENABLE_TIMEDATED
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.timedate1.service && \
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
endif
if ENABLE_LOCALED
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.locale1.service && \

2
po/POTFILES.in
View File

@ -1,4 +1,4 @@
src/org.freedesktop.hostname1.policy.in
src/org.freedesktop.locale1.policy.in
src/login/org.freedesktop.login1.policy.in
src/org.freedesktop.timedate1.policy.in
src/timedate/org.freedesktop.timedate1.policy.in

2
po/POTFILES.skip
View File

@ -14,6 +14,6 @@ src/dbus-unit.c
src/hostnamed.c
src/localed.c
src/org.freedesktop.systemd1.policy.in.in
src/timedated.c
src/timedate/timedated.c
units/systemd-readahead-done.service.in
units/user@.service.in

0
src/org.freedesktop.timedate1.conf → src/timedate/org.freedesktop.timedate1.conf
View File

0
src/org.freedesktop.timedate1.policy.in → src/timedate/org.freedesktop.timedate1.policy.in
View File

0
src/org.freedesktop.timedate1.service → src/timedate/org.freedesktop.timedate1.service
View File

0
src/timedated.c → src/timedate/timedated.c
View File