[anjuta/gsettings-migration: 57/65] Fixed gschema build
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/gsettings-migration: 57/65] Fixed gschema build
- Date: Sun, 17 Oct 2010 09:37:33 +0000 (UTC)
commit 339f5852a23b927a8acd260d25750314f3778948
Author: Johannes Schmid <jhs gnome org>
Date: Tue Oct 12 22:38:45 2010 +0200
Fixed gschema build
plugins/build-basic-autotools/Makefile.am | 2 +-
plugins/starter/Makefile.am | 2 --
plugins/terminal/Makefile.am | 1 +
scripts/build-schemas.mk | 7 +++++--
src/Makefile.am | 1 +
5 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/plugins/build-basic-autotools/Makefile.am b/plugins/build-basic-autotools/Makefile.am
index cc50fca..afde7dc 100644
--- a/plugins/build-basic-autotools/Makefile.am
+++ b/plugins/build-basic-autotools/Makefile.am
@@ -58,7 +58,7 @@ libanjuta_build_basic_autotools_la_LIBADD = \
libanjuta_build_basic_autotools_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
-prefs_name = org.gnome.anjuta.build-basic-autotools
+prefs_name = org.gnome.anjuta.build
prefs_ui_files = anjuta-build-basic-autotools-plugin.ui
include $(top_srcdir)/scripts/build-schemas.mk
diff --git a/plugins/starter/Makefile.am b/plugins/starter/Makefile.am
index 146e587..6e83cd0 100644
--- a/plugins/starter/Makefile.am
+++ b/plugins/starter/Makefile.am
@@ -30,8 +30,6 @@ libanjuta_starter_la_SOURCES= \
starter.h \
starter.c
-include $(top_srcdir)/scripts/build-schemas.mk
-
EXTRA_DIST = \
$(plugin_in_files) \
$(starter_plugin_DATA) \
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 92cc2c9..531e6c5 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -44,6 +44,7 @@ libanjuta_terminal_la_LIBADD = \
$(LIBANJUTA_LIBS)
prefs_ui_files = anjuta-terminal-plugin.ui
+prefs_name = org.gnome.anjuta.terminal
include $(top_srcdir)/scripts/build-schemas.mk
EXTRA_DIST = \
diff --git a/scripts/build-schemas.mk b/scripts/build-schemas.mk
index 0113c7c..b14120a 100644
--- a/scripts/build-schemas.mk
+++ b/scripts/build-schemas.mk
@@ -3,7 +3,10 @@
prefs_ui_schemas = $(prefs_ui_files:.ui=.gschema.xml)
# gsettings_SCHEMAS is a list of all the schemas you want to install
-gsettings_SCHEMAS = $(prefs_ui_schemas)
+gsettings_SCHEMAS = $(prefs_name).gschema.xml
+
+$(prefs_name).gschema.xml: $(prefs_ui_schemas)
+ mv $< $@
%.gschema.xml: %.ui
$(AM_V_GEN)$(top_srcdir)/scripts/builder2schema.pl $< $(prefs_name) $(prefs_keyfile) >> $@
@@ -11,4 +14,4 @@ gsettings_SCHEMAS = $(prefs_ui_schemas)
# include the appropriate makefile rules for schema handling
@GSETTINGS_RULES@
-CLEANFILES = $(prefs_ui_schemas)
+CLEANFILES = $(prefs_ui_schemas) $(gsettings_SCHEMAS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c7fb0d..be38dbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,7 @@ anjuta_LDADD = \
anjuta_LDFLAGS = $(ANJUTA_LDFLAGS)
prefs_ui_files = preferences.ui
+prefs_name = org.gnome.anjuta
prefs_keyfile = anjuta.gschema-part.xml
include $(top_srcdir)/scripts/build-schemas.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]