[embedlite-components] Add search-engine sub-module. Contributes to J…

…B#35139 Local builds done with build.sh will pick the search engines from the sub-module. However, the search engines are no longer packaged by the embedlite-components-qt5 to increase flexibility of the search engine deployment.
sailfishos · May 13, 2016 · aeae934 · aeae934
1 parent e86bc81
commit aeae934
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 140 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "search-engines"]
+	path = search-engines
+	url = ssh://git@git.merproject.org:2222/mer-core/embedlite-components-search-engines.git
diff --git a/embedlite-components.pro b/embedlite-components.pro
@@ -1,8 +1,10 @@
-TEMPLATE = aux
+TEMPLATE = subdirs
 
 SOURCES += touchhelper/*.cpp
 HEADERS += touchhelper/*.h
 
+SUBDIRS += search-engines
+
 OTHER_FILES += \
     jsscripts/*.js \
     jsscripts/*.xml \

diff --git a/jsscripts/Makefile.am b/jsscripts/Makefile.am
@@ -7,12 +7,6 @@ jsscripts_manifest_DATA = \
 	SelectionHandler.js \
 	Util.js \
 	ContextMenuHandler.js \
-	bing.xml \
-	google.xml \
-	yahoo.xml \
-	yandex.xml \
-	baidu.xml \
-	duckduckgo.xml \
 	$(NULL)
 
 sync_engine_manifestdir=$(libdir)/mozembedlite/chrome/embedlite/content/sync

diff --git a/jsscripts/baidu.xml b/jsscripts/baidu.xml
diff --git a/jsscripts/bing.xml b/jsscripts/bing.xml
diff --git a/jsscripts/duckduckgo.xml b/jsscripts/duckduckgo.xml
diff --git a/jsscripts/google.xml b/jsscripts/google.xml
diff --git a/jsscripts/startpage.xml b/jsscripts/startpage.xml
diff --git a/jsscripts/yahoo.xml b/jsscripts/yahoo.xml