2:17 p.m.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr(a)linux.vnet.ibm.com>
---
configure.ac | 3 +++
src/kimchi/config.py.in | 2 +-
ui/Makefile.am | 2 +-
ui/{ => fontello}/Makefile.am | 8 ++++----
ui/{ => fontello/css}/Makefile.am | 8 +++-----
ui/{ => fontello/font}/Makefile.am | 8 +++-----
6 files changed, 15 insertions(+), 16 deletions(-)
copy ui/{ => fontello}/Makefile.am (81%)
copy ui/{ => fontello/css}/Makefile.am (81%)
copy ui/{ => fontello/font}/Makefile.am (81%)
diff --git a/configure.ac b/configure.ac
index 0261b5f..9e3edb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,9 @@ AC_CONFIG_FILES([
plugins/sample/ui/pages/Makefile
ui/Makefile
ui/css/Makefile
+ ui/fontello/Makefile
+ ui/fontello/css/Makefile
+ ui/fontello/font/Makefile
ui/images/Makefile
ui/images/theme-default/Makefile
ui/js/Makefile
diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in
index 8cc63e7..d2c5169 100644
--- a/src/kimchi/config.py.in
+++ b/src/kimchi/config.py.in
@@ -176,7 +176,7 @@ class UIConfig(dict):
def __init__(self, paths):
ui_configs = {}
- for sub_dir in ('css', 'js', 'libs', 'images'):
+ for sub_dir in ('css', 'fontello', 'js', 'libs',
'images'):
ui_configs['/' + sub_dir] = {
'tools.staticdir.on': True,
'tools.staticdir.dir': os.path.join(paths.ui_dir, sub_dir),
diff --git a/ui/Makefile.am b/ui/Makefile.am
index d541355..adb6ada 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = css images js libs pages spice-html5
+SUBDIRS = css fontello images js libs pages spice-html5
uidir = $(datadir)/kimchi/ui
diff --git a/ui/Makefile.am b/ui/fontello/Makefile.am
similarity index 81%
copy from ui/Makefile.am
copy to ui/fontello/Makefile.am
index d541355..0576ed2 100644
--- a/ui/Makefile.am
+++ b/ui/fontello/Makefile.am
@@ -1,7 +1,7 @@
#
# Kimchi
#
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2015
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = css images js libs pages spice-html5
+SUBDIRS = css font
-uidir = $(datadir)/kimchi/ui
+fontellodir = $(datadir)/wok/ui/fontello
-dist_ui_DATA = robots.txt
+dist_fontello_DATA = LICENSE.txt
diff --git a/ui/Makefile.am b/ui/fontello/css/Makefile.am
similarity index 81%
copy from ui/Makefile.am
copy to ui/fontello/css/Makefile.am
index d541355..50b5489 100644
--- a/ui/Makefile.am
+++ b/ui/fontello/css/Makefile.am
@@ -1,7 +1,7 @@
#
# Kimchi
#
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2015
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = css images js libs pages spice-html5
+cssdir = $(datadir)/wok/ui/fontello/css
-uidir = $(datadir)/kimchi/ui
-
-dist_ui_DATA = robots.txt
+dist_css_DATA = $(wildcard *.css) $(NULL)
diff --git a/ui/Makefile.am b/ui/fontello/font/Makefile.am
similarity index 81%
copy from ui/Makefile.am
copy to ui/fontello/font/Makefile.am
index d541355..da9cb66 100644
--- a/ui/Makefile.am
+++ b/ui/fontello/font/Makefile.am
@@ -1,7 +1,7 @@
#
# Kimchi
#
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2015
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = css images js libs pages spice-html5
+fontdir = $(datadir)/wok/ui/fontello/font
-uidir = $(datadir)/kimchi/ui
-
-dist_ui_DATA = robots.txt
+dist_font_DATA = $(wildcard fontello.*) $(NULL)
--
1.7.1