[caribou] Use new magic to auto-generate gconf schema file.
- From: Eitan Isaacson <eitani src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [caribou] Use new magic to auto-generate gconf schema file.
- Date: Thu, 9 Dec 2010 08:09:20 +0000 (UTC)
commit 55c6fda73aa9b802600116a8a7139b789f21f696
Author: Eitan Isaacson <eitan monotonous org>
Date: Thu Dec 9 00:04:28 2010 -0800
Use new magic to auto-generate gconf schema file.
.gitignore | 5 +-
data/Makefile.am | 15 ++--
data/caribou.schemas | 191 --------------------------------------------------
3 files changed, 10 insertions(+), 201 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f23b105..3402137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
*.pyc
-*.swp
-*.orig
*~
Makefile
Makefile.in
@@ -24,4 +22,5 @@ m4/intltool.m4
*.tar.gz
data/caribou.desktop
po/.intltool-merge-cache
-
+data/caribou.schemas
+data/caribou.schemas.in
diff --git a/data/Makefile.am b/data/Makefile.am
index fb32b10..fd7f312 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,20 +1,21 @@
SUBDIRS = keyboards
-gtkbuilderdir = $(datadir)/caribou
-gtkbuilder_DATA = caribou-prefs.ui
-
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = caribou.schemas
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = caribou.schemas.in
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ INTLTOOL_SCHEMAS_RULE@
desktopdir = $(datadir)/applications
desktop_in_files = caribou.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = $(gtkbuilder_DATA) \
- $(schema_DATA) \
+EXTRA_DIST = $(schema_DATA) \
$(desktop_in_files)
+caribou.schemas.in: $(top_srcdir)/caribou/common/settings.py
+ PYTHONPATH=$(top_srcdir) $(PYTHON) $< > $@
+
CLEANFILES = $(desktop_DATA)
# installation of schemas
if GCONF_SCHEMAS_INSTALL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]