From 53b340d7f8c011e9e018ee62de4d2fe97f034754 Mon Sep 17 00:00:00 2001
From: Youmin Ha <youmin.ha@samsung.com>
Date: Thu, 7 Mar 2013 20:28:13 +0900
Subject: [PATCH] build: Fix Makefile to add globalize to the minified lib

During Makefile fix, Globalize is moved from web-ui-fw.js to
web-ui-fw-libs.js. but the minified web-ui-fw-libs.min.js did not
contain Globalize, so it is added to the list of 3rd-party libs.

Change-Id: I795007a790ed7b42d1329d7d1d27ed990746be4f
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 664d3b7..a9f6949 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,8 @@ FW_WIDGET_CSS_FILE = ${WIDGET_CSS_OUTPUT_ROOT}/${PROJECT_NAME}-widget.css
 LIBS_JS_FILES = jquery.easing.1.3.js \
 		jquery.tmpl.js \
 		jquery.mobile.js \
-                $(NULL)
+		globalize/lib/globalize.js \
+		$(NULL)
 
 JQUERY_MOBILE_CSS = submodules/jquery-mobile/compiled/jquery.mobile.structure.css \
                     submodules/jquery-mobile/compiled/jquery.mobile.css \
@@ -87,7 +88,7 @@ jqm: init
 	cd ${JQM_LIB_PATH} && make js NODE=/usr/bin/node || exit 1; \
 	cp -f ${JQM_LIB_PATH}/compiled/*.js ${JQM_LIB_PATH}/../; \
 
-third_party: init jqm
+third_party: init jqm globalize
 	# Building third party components...
 	@@cd ${LIBS_DIR}/js; \
 	    for f in ${LIBS_JS_FILES}; do \
@@ -98,7 +99,7 @@ third_party: init jqm
 	    cp ${LIBS_DIR}/js/${JQUERY} ${JS_OUTPUT_ROOT}/jquery.js
 	    cp ${LIBS_DIR}/js/${JQUERY_MIN} ${JS_OUTPUT_ROOT}/jquery.min.js
 
-js: init third_party globalize
+js: init third_party
 	# Building JS files...
 	mkdir -p ${JS_LIB_OUTPUT_DIR}; \
 	cp -a ${JS_DIR}/* ${JS_LIB_OUTPUT_DIR}/; \
@@ -176,7 +177,6 @@ widgets: init third_party globalize
 	    done
 
 globalize:
-	cat 'libs/js/globalize/lib/globalize.js' >> ${FW_LIB_JS}
 	# copy globalize libs...
 	cp -a libs/js/globalize/lib/cultures ${FRAMEWORK_ROOT}/js/
 
@@ -187,7 +187,7 @@ version: js themes
 	echo '(function($$){$$.tizen.frameworkData.pkgVersion="$(PKG_VERSION)";}(jQuery));' >> ${FW_JS}
 	echo "$(PKG_VERSION)" > ${FRAMEWORK_ROOT}/../VERSION
 
-compress: js themes
+compress: third_party js themes
 	# Javacript code compressing
 	@@echo "	# Compressing...."; \
 	echo '/*' > ${FW_MIN}; \
-- 
2.7.4