summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-12 01:11:27 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-12 01:11:40 +0200
commit9356a6c656357fe67b310cbbb270c6ccd1048e82 (patch)
tree9b31b5b2ea15f0db23cd493a8004f05877d84d64
parent7a41c61168632501489a4d054619b86f529a02e7 (diff)
build-sys: fix make distcheck
-rw-r--r--Makefile.am26
-rw-r--r--po/POTFILES.skip19
-rw-r--r--src/.gitignore4
-rw-r--r--src/org.freedesktop.systemd1.policy.in.in (renamed from src/org.freedesktop.systemd1.policy.in)8
4 files changed, 44 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 96e8838669..e5eeda393f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -411,7 +411,6 @@ EXTRA_DIST = \
units/user@.service.in \
systemd.pc.in \
introspect.awk \
- src/org.freedesktop.systemd1.policy.in \
src/73-seat-late.rules.in
if ENABLE_BINFMT
@@ -475,17 +474,26 @@ dist_doc_DATA = \
pkgconfigdata_DATA = \
systemd.pc
-nodist_polkitpolicy_DATA = \
- src/org.freedesktop.systemd1.policy
-
-dist_polkitpolicy_in_files = \
+# Passed through intltool only
+polkitpolicy_in_files = \
src/org.freedesktop.hostname1.policy.in \
src/org.freedesktop.locale1.policy.in \
src/org.freedesktop.timedate1.policy.in \
src/org.freedesktop.login1.policy.in
+# First passed through sed, followed by intltool
+polkitpolicy_in_in_files = \
+ src/org.freedesktop.systemd1.policy.in.in
+
+nodist_polkitpolicy_DATA = \
+ $(polkitpolicy_in_files:.policy.in=.policy) \
+ $(polkitpolicy_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+ $(polkitpolicy_in_files) \
+ $(polkitpolicy_in_in_files)
+
@INTLTOOL_POLICY_RULE@
-polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
noinst_LTLIBRARIES = \
libsystemd-basic.la \
@@ -1357,7 +1365,7 @@ man/%: man/%.in Makefile
%.pc: %.pc.in Makefile
$(SED_PROCESS)
-src/%.policy: src/%.policy.in Makefile
+src/%.policy.in: src/%.policy.in.in Makefile
$(SED_PROCESS)
src/%.rules: src/%.rules.in Makefile
@@ -1383,8 +1391,8 @@ CLEANFILES = \
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA) \
- $(polkitpolicy_DATA) \
- src/org.freedesktop.systemd1.policy
+ $(nodist_polkitpolicy_DATA) \
+ src/73-seat-late.rules
if HAVE_VALAC
CLEANFILES += \
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000000..192f3b6cc6
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,19 @@
+src/dbus-automount.c
+src/dbus-device.c
+src/dbus-job.c
+src/dbus-manager.c
+src/dbus-mount.c
+src/dbus-path.c
+src/dbus-service.c
+src/dbus-snapshot.c
+src/dbus-socket.c
+src/dbus-swap.c
+src/dbus-target.c
+src/dbus-timer.c
+src/dbus-unit.c
+src/hostnamed.c
+src/localed.c
+src/org.freedesktop.systemd1.policy.in.in
+src/timedated.c
+units/systemd-readahead-done.service.in
+units/user@.service.in
diff --git a/src/.gitignore b/src/.gitignore
index de3bb5f100..8832dd6d3f 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,7 @@
+org.freedesktop.hostname1.policy
+org.freedesktop.locale1.policy
+org.freedesktop.login1.policy
+org.freedesktop.timedate1.policy
org.freedesktop.systemd1.policy
gnome-ask-password-agent.c
systemd-interfaces.c
diff --git a/src/org.freedesktop.systemd1.policy.in b/src/org.freedesktop.systemd1.policy.in.in
index 52a28d40ea..1771314e09 100644
--- a/src/org.freedesktop.systemd1.policy.in
+++ b/src/org.freedesktop.systemd1.policy.in.in
@@ -17,8 +17,8 @@
<vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
<action id="org.freedesktop.systemd1.reply-password">
- <description>Send passphrase back to system</description>
- <message>Authentication is required to send the entered passphrase back to the system.</message>
+ <_description>Send passphrase back to system</_description>
+ <_message>Authentication is required to send the entered passphrase back to the system.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
@@ -28,8 +28,8 @@
</action>
<action id="org.freedesktop.systemd1.bus-access">
- <description>Privileged system and service manager access</description>
- <message>Authentication is required to access the system and service manager.</message>
+ <_description>Privileged system and service manager access</_description>
+ <_message>Authentication is required to access the system and service manager.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>