[gnome-shell-extensions] Build system: fix, and make quieter
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] Build system: fix, and make quieter
- Date: Sat, 19 Feb 2011 17:55:36 +0000 (UTC)
commit 7a4e22feec1944153b69b2f77ecd18d999a63cfe
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Sat Feb 19 18:50:53 2011 +0100
Build system: fix, and make quieter
Fix for make distcheck.
At the same time, use silent rules when expanding metadata.json.
configure.ac | 2 +-
extension.mk | 2 +-
extensions/auto-move-windows/Makefile.am | 1 +
po/POTFILES.in | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3688bf7..61e8986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([gnome-shell-extensions],[2.91.6],[https://bugzilla.gnome.org/enter_bug.
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign])
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign tar-ustar])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/extension.mk b/extension.mk
index 1370d97..3b77f8e 100644
--- a/extension.mk
+++ b/extension.mk
@@ -12,7 +12,7 @@ nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
EXTRA_DIST = metadata.json.in
metadata.json: metadata.json.in
- sed -e "s|[ ]LOCALEDIR@|$(datadir)/locale|" \
+ $(AM_V_GEN) sed -e "s|[ ]LOCALEDIR@|$(datadir)/locale|" \
-e "s|[ ]uuid@|$(uuid)|" \
-e "s|[ ]shell_current@|$(PACKAGE_VERSION)|" $< > $@
diff --git a/extensions/auto-move-windows/Makefile.am b/extensions/auto-move-windows/Makefile.am
index f002bc9..79dda61 100644
--- a/extensions/auto-move-windows/Makefile.am
+++ b/extensions/auto-move-windows/Makefile.am
@@ -11,3 +11,4 @@ gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
@GSETTINGS_RULES@
CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
+EXTRA_DIST += $(gschemas_in)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9d6ae8a..3082970 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,4 +3,4 @@ extensions/windowsNavigator/extension.js
extensions/xrandr-indicator/extension.js
extensions/alternate-tab/extension.js
extensions/auto-move-windows/extension.js
-extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.in
\ No newline at end of file
+extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]