[gnome-applets] stickynotes: move panel-applet file to data folder

[Sebastian Geiger <segeiger src gnome org>]

commit 3a049f7c833e27ffb3d99f6963f03d8fbb11b0f6
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Aug 21 15:32:16 2016 +0200

    stickynotes: move panel-applet file to data folder

 configure.ac                                       |    1 +
 po/POTFILES.in                                     |    2 +-
 stickynotes/Makefile.am                            |   19 +-------------
 stickynotes/data/Makefile.am                       |   26 ++++++++++++++++++++
 ...me.applets.StickyNotesApplet.panel-applet.in.in |    0
 5 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5a1348e..f0ae8fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -730,6 +730,7 @@ AC_CONFIG_FILES([
   netspeed/Makefile
 
   stickynotes/Makefile
+  stickynotes/data/Makefile
   stickynotes/src/Makefile
   stickynotes/help/Makefile
   stickynotes/pixmaps/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 59662cf..0c9ca2b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,7 +95,7 @@ netspeed/data/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
 [type: gettext/ini]netspeed/data/org.gnome.panel.Netspeed.panel-applet.in.in
 netspeed/src/netspeed.c
 netspeed/src/preferences.c
-[type: gettext/ini]stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
+[type: gettext/ini]stickynotes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
 stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 [type: gettext/glade]stickynotes/stickynotes-applet-menu.xml
 stickynotes/src/stickynotes.c
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 05a2de8..d801263 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -1,8 +1,6 @@
 NULL =
 
-SUBDIRS = help pixmaps src
-
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libsticky-notes-applet.so
+SUBDIRS = data help pixmaps src
 
 ui_files = stickynotes-applet-menu.xml \
        stickynotes-note-menu.xml
@@ -11,7 +9,6 @@ builder_files = stickynotes-note.ui \
        stickynotes-delete-all.ui \
        stickynotes-preferences.ui \
        stickynotes-properties.ui
-applet_in_files = org.gnome.applets.StickyNotesApplet.panel-applet.in
 gsettings_schemas_in_in = org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 
 if BUILD_STICKYNOTES_APPLET
@@ -32,20 +29,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-appletdir   = $(LIBPANEL_APPLET_DIR)
-applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
-       $(AM_V_GEN)sed \
-            -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
-            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
-
-%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 CLEANFILES = \
-       $(applet_DATA) \
-       $(applet_DATA).in \
        $(gsettings_SCHEMAS_in) \
        $(gsettings_SCHEMAS) \
        *.gschema.valid \
@@ -58,7 +42,6 @@ EXTRA_DIST = \
        $(builder_files) \
        $(ui_files) \
        $(schemas_in_files) \
-       org.gnome.applets.StickyNotesApplet.panel-applet.in.in \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/stickynotes/data/Makefile.am b/stickynotes/data/Makefile.am
new file mode 100644
index 0000000..6541647
--- /dev/null
+++ b/stickynotes/data/Makefile.am
@@ -0,0 +1,26 @@
+NULL =
+
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libsticky-notes-applet.so
+
+appletdir   = $(LIBPANEL_APPLET_DIR)
+applet_in_files = org.gnome.applets.StickyNotesApplet.panel-applet.in
+applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+       $(AM_V_GEN)sed \
+            -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+            $< > $@
+
+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+EXTRA_DIST = \
+       org.gnome.applets.StickyNotesApplet.panel-applet.in.in \
+       $(NULL)
+
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in 
b/stickynotes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
similarity index 100%
rename from stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
rename to stickynotes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in