[gnome-boxes] build: Fix the Makefile rules for the GSettings schema



commit 06099b1b43a2607eecbde07c698d98c12f2e8534
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Aug 16 16:11:46 2017 +0200

    build: Fix the Makefile rules for the GSettings schema
    
    @GSETTINGS_RULES@ comes from the GLIB_GSETTINGS M4 macro shipped by
    GLib in gsettings.m4. It's unrelated to intltool and should be retained
    as long as Makefiles are being used.
    
    Secondly, unlike desktop and appdata files, the translations for
    GSettings schemas are not merged back during the build. The
    translatable strings are extracted during the build, but the
    translations are fetched at runtime. This is similar to how it works
    for source code. Therefore, there is no need for the *.gschema.xml.in
    to *.gschema.xml indirection. Note that this was already not necessary
    with intltool >= 0.50.
    
    Fallout from 10476bf2cb47e8fcea995a9faf595c685e88d4b5
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783832

 data/Makefile.am                                   |    7 ++-----
 ....gschema.xml.in => org.gnome.boxes.gschema.xml} |    0
 po/POTFILES.in                                     |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 22d540c..e035862 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,9 +12,7 @@ all-local: $(desktop_DATA)
        @$(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
 
 gsettings_SCHEMAS = org.gnome.boxes.gschema.xml
-
-$(gsettings_SCHEMAS): org.gnome.boxes.gschemal.xml.in
-       $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+@GSETTINGS_RULES@
 
 appdatadir = $(datadir)/appdata
 appdata_in_file = org.gnome.Boxes.appdata.xml.in
@@ -55,9 +53,9 @@ org.gnome.Boxes.service: org.gnome.Boxes.service.in Makefile
 EXTRA_DIST =                                   \
        org.gnome.Boxes.desktop.in              \
        gnome-boxes-search-provider.ini.in      \
-       org.gnome.boxes.gschema.xml.in          \
        org.gnome.Boxes.service.in      \
        $(gresource_file)                       \
+       $(gsettings_SCHEMAS)                    \
        $(resource_files)                       \
        $(desktop_in_files)                     \
        $(source_DATA)                          \
@@ -72,7 +70,6 @@ CLEANFILES =                                  \
        $(NULL)
 
 DISTCLEANFILES =                               \
-       $(gsettings_SCHEMAS)                    \
        $(service_DATA)                         \
        $(desktop_DATA)                         \
        $(appdata_DATA)                         \
diff --git a/data/org.gnome.boxes.gschema.xml.in b/data/org.gnome.boxes.gschema.xml
similarity index 100%
rename from data/org.gnome.boxes.gschema.xml.in
rename to data/org.gnome.boxes.gschema.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 99d7bb9..63102b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 data/org.gnome.Boxes.appdata.xml.in
 data/org.gnome.Boxes.desktop.in.in
 data/gnome-boxes-search-provider.ini.in
-data/org.gnome.boxes.gschema.xml.in
+data/org.gnome.boxes.gschema.xml
 data/ui/app-window.ui
 data/ui/auth-notification.ui
 data/ui/collection-filter-switcher.ui


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