[gnome-applets] tracker-search-bar: move panel-applet file to data folder
- From: Sebastian Geiger <segeiger src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] tracker-search-bar: move panel-applet file to data folder
- Date: Fri, 29 Jul 2016 22:34:59 +0000 (UTC)
commit c768119800a287ec40c724cd6d25b91d67e6f0f1
Author: Sebastian Geiger <sbastig gmx net>
Date: Fri Jul 29 22:40:47 2016 +0200
tracker-search-bar: move panel-applet file to data folder
configure.ac | 1 +
tracker-search-bar/Makefile.am | 23 +----------------
tracker-search-bar/data/Makefile.am | 26 ++++++++++++++++++++
.../org.gnome.panel.SearchBar.panel-applet.in.in | 0
4 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aaecad8..9a5897b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -737,6 +737,7 @@ AC_CONFIG_FILES([
tracker-search-bar/Makefile
tracker-search-bar/src/Makefile
+ tracker-search-bar/data/Makefile
trash/help/Makefile
trash/Makefile
diff --git a/tracker-search-bar/Makefile.am b/tracker-search-bar/Makefile.am
index 3acb019..184f167 100644
--- a/tracker-search-bar/Makefile.am
+++ b/tracker-search-bar/Makefile.am
@@ -1,21 +1,6 @@
NULL =
-SUBDIRS = src
-
-# Panel applet
-appletdir = $(LIBPANEL_APPLET_DIR)
-applet_in_files = org.gnome.panel.SearchBar.panel-applet.in
-applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtracker-search-bar-applet.so
-
-$(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
+SUBDIRS = src data
# Applet UIs and menu
uidir = $(pkgdatadir)/ui
@@ -25,13 +10,7 @@ ui_DATA = \
$(NULL)
EXTRA_DIST = \
- org.gnome.panel.SearchBar.panel-applet.in.in \
$(ui_DATA) \
$(NULL)
-CLEANFILES = \
- $(applet_DATA) \
- $(applet_DATA).in \
- $(NULL)
-
-include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/data/Makefile.am b/tracker-search-bar/data/Makefile.am
new file mode 100644
index 0000000..21a5b1d
--- /dev/null
+++ b/tracker-search-bar/data/Makefile.am
@@ -0,0 +1,26 @@
+NULL =
+
+appletdir = $(LIBPANEL_APPLET_DIR)
+applet_in_files = org.gnome.panel.SearchBar.panel-applet.in
+applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtracker-search-bar-applet.so
+
+$(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.panel.SearchBar.panel-applet.in.in \
+ $(NULL)
+
+CLEANFILES = \
+ $(applet_DATA) \
+ $(applet_DATA).in \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
b/tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in
similarity index 100%
rename from tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
rename to tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]