[gnome-applets/wip/segeiger/in-process: 3/6] stickynotes: move gschema file to src folder



commit 49674b038e0ae63ae9ca9775cb1a9a87a17e8e4c
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Aug 21 15:41:26 2016 +0200

    stickynotes: move gschema file to src folder

 po/POTFILES.in                                     |    2 +-
 stickynotes/Makefile.am                            |   19 ----------------
 stickynotes/src/Makefile.am                        |   23 ++++++++++++++++++++
 ...ome.gnome-applets.stickynotes.gschema.xml.in.in |    0
 4 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4bd5490..5fab8ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -96,7 +96,7 @@ netspeed/data/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
 netspeed/src/netspeed.c
 netspeed/src/preferences.c
 [type: gettext/ini]stickynotes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
-stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
+stickynotes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 [type: gettext/glade]stickynotes/stickynotes-applet-menu.xml
 stickynotes/src/stickynotes.c
 stickynotes/src/stickynotes_applet.c
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index d801263..401c760 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -9,7 +9,6 @@ builder_files = stickynotes-note.ui \
        stickynotes-delete-all.ui \
        stickynotes-preferences.ui \
        stickynotes-properties.ui
-gsettings_schemas_in_in = org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 
 if BUILD_STICKYNOTES_APPLET
 
@@ -19,29 +18,11 @@ builder_DATA = $(builder_files)
 uidir = $(pkgdatadir)/ui
 ui_DATA = $(ui_files)
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
-CLEANFILES = \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid \
-       $(NULL)
-
 endif
 
 EXTRA_DIST = \
-       $(gsettings_schemas_in_in) \
        $(builder_files) \
        $(ui_files) \
-       $(schemas_in_files) \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/stickynotes/src/Makefile.am b/stickynotes/src/Makefile.am
index 0315274..dd18a6f 100644
--- a/stickynotes/src/Makefile.am
+++ b/stickynotes/src/Makefile.am
@@ -48,6 +48,29 @@ libsticky_notes_applet_la_LIBADD = \
        $(XML2_LIBS) \
        $(NULL)
 
+gsettings_schemas_in_in = \
+       org.gnome.gnome-applets.stickynotes.gschema.xml.in.in \
+       $(NULL)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
+gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+       $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
+
+@GSETTINGS_RULES@
+
+CLEANFILES = \
+       $(gsettings_SCHEMAS) \
+       *.gschema.valid \
+       $(NULL)
+
 endif
 
+EXTRA_DIST = \
+       $(gsettings_schemas_in_in) \
+       $(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in 
b/stickynotes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
similarity index 100%
rename from stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
rename to stickynotes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in


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