[hotssh] Revert "build: Don't use GLIB_GSETTINGS as it's broken with srcdir != builddir"



commit 22a259d0d91e1de6401aff843f948d8d69e9ae41
Author: Colin Walters <walters verbum org>
Date:   Mon Nov 18 14:09:50 2013 -0500

    Revert "build: Don't use GLIB_GSETTINGS as it's broken with srcdir != builddir"
    
    This reverts commit fec5954f20afe30d74669917894f41ae68bd5206.

 Makefile-src.am |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/Makefile-src.am b/Makefile-src.am
index 98615fb..96474fb 100644
--- a/Makefile-src.am
+++ b/Makefile-src.am
@@ -43,12 +43,14 @@ resources.c: src/hotssh.gresource.xml $(shell glib-compile-resources --sourcedir
        $(AM_V_GEN) glib-compile-resources $< \
                --target=$@ --sourcedir=$(srcdir)/src --generate-source
 hotssh_SOURCES += resources.c
-BUILT_SOURCES += resources.c
+BUILT_SOURCES += resources.c gschemas.compiled
 
-# We don't use gsettings_SCHEMAS as it fails with
-# srcdir != builddir:
-# https://bugzilla.gnome.org/show_bug.cgi?id=712171
-gsettingsschema_DATA = src/org.gnome.hotssh.gschema.xml
+gsettings_SCHEMAS += src/org.gnome.hotssh.gschema.xml
+
+ GSETTINGS_RULES@
+
+gschemas.compiled: src/org.gnome.hotssh.gschema.xml
+       glib-compile-schemas .
 
 desktopdir=$(datadir)/applications
 desktop_DATA = src/hotssh.desktop


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]