[ekiga/ds-gsettings: 2/2] GSettings: Added compilation and installation of schema file.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-gsettings: 2/2] GSettings: Added compilation and installation of schema file.
- Date: Sun, 17 Mar 2013 16:47:24 +0000 (UTC)
commit 5592ef9d20afb421d9463f76f6df171c97f7bd28
Author: Damien Sandras <dsandras beip be>
Date: Sun Mar 17 17:46:46 2013 +0100
GSettings: Added compilation and installation of schema file.
Makefile.am | 10 ++++++++--
configure.ac | 7 +++++++
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d85bea7..e28dd76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man sounds pixmaps lib src plugins po
+SUBDIRS = man sounds pixmaps lib src plugins po
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -18,6 +18,11 @@ DESKTOP_FILE= PACKAGE_NAME@.desktop
SCHEMAS_IN_IN_FILE = @PACKAGE_NAME schemas in in
SCHEMAS_FILE = @PACKAGE_NAME schemas
+gsettings_SCHEMAS = org.gnome.ekiga.gschema.xml
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
### Win32 files
WIN32_DIST = \
@@ -58,6 +63,7 @@ EXTRA_DIST = \
README \
LICENSE \
MAINTAINERS \
+ $(gsettings_SCHEMAS) \
$(SCHEMAS_FILE) \
$(WIN32_DIST)
@@ -66,7 +72,7 @@ Applications_DATA = $(DESKTOP_FILE)
### Dist Clear
-DISTCLEANFILES=gnome-doc-utils.make ekiga.desktop ekiga.schemas
+DISTCLEANFILES=gnome-doc-utils.make ekiga.desktop ekiga.schemas org.gnome.ekiga.gschema
MAINTAINERCLEANFILES= \
Makefile.in aclocal.m4 compile config.guess config.sub \
diff --git a/configure.ac b/configure.ac
index bae6b8f..cb46a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,12 @@ AC_SUBST(XML_LIBS)
dnl ###############################
+dnl GSettings support
+dnl ###############################
+
+GLIB_GSETTINGS
+
+dnl ###############################
dnl GConf support
dnl ###############################
GCONF="disabled"
@@ -860,6 +866,7 @@ dnl ###########################################################################
AC_CONFIG_FILES([Makefile
Doxyfile
src/ekiga-config-tool
+org.gnome.ekiga.gschema.xml.in
ekiga.schemas.in
ekiga.desktop.in
lib/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]