# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1271861613 -3600
# Node ID bd0cbdaaf2be8d7e237ed9bb9fa5d6d459edbe22
# Parent  1951b3078691d6f5135c278dd56ca204329a092a
Better structuring of fontsupport\fontutils to fix Bug 26 and Bug 2098

diff -r 1951b3078691 -r bd0cbdaaf2be fontsupport/fontutils/FontUtils/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontsupport/fontutils/FontUtils/group/bld.inf	Wed Apr 21 15:53:33 2010 +0100
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Bldmake component description file for the FontUtils component
+*
+*/
+
+PRJ_EXPORTS
+
+// Export IBY files
+../../rom/FontUtils.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(FontUtils.iby)
+../../rom/fonts_variant.iby                          CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(fonts_variant.iby)
+
+PRJ_MMPFILES
+#ifndef TOOLS
+  FontUtils.mmp
+#endif
+
diff -r 1951b3078691 -r bd0cbdaaf2be fontsupport/fontutils/group/bld.inf
--- a/fontsupport/fontutils/group/bld.inf	Fri Apr 16 16:01:57 2010 +0300
+++ b/fontsupport/fontutils/group/bld.inf	Wed Apr 21 15:53:33 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,14 +16,6 @@
 */
 
 
-
-// BLD.INF
-//
-// Copyright (c) 1999 Symbian Ltd.  All rights reserved.
-//
-
-#include <platform_paths.hrh>
-
 PRJ_EXPORTS
 
 // Copy font rasterizer
@@ -99,10 +91,6 @@
 ../Vectorfonts/Series60Korean.ttf                        /epoc32/release/armv5/udeb/Series60Korean.ttf
 ../Vectorfonts/Series60Korean.ttf                        /epoc32/release/armv5/urel/Series60Korean.ttf
 
-// Export IBY files
-../rom/FontUtils.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(FontUtils.iby)
-../rom/fonts_variant.iby                          CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(fonts_variant.iby)
-
 ./removegtfiles.meta                             /epoc32/tools/makefile_templates/s60/removegtfiles.meta
 ./removegtfiles.flm                              /epoc32/tools/makefile_templates/s60/removegtfiles.flm
 
@@ -114,8 +102,6 @@
 
 PRJ_MMPFILES
 #ifndef TOOLS
-    ../FontUtils/group/FontUtils.mmp
-
     // Remove Symbian fonts
     #ifndef SBSV2
       gnumakefile removegtfiles.mk
diff -r 1951b3078691 -r bd0cbdaaf2be fontsupport/group/bld.inf
--- a/fontsupport/group/bld.inf	Fri Apr 16 16:01:57 2010 +0300
+++ b/fontsupport/group/bld.inf	Wed Apr 21 15:53:33 2010 +0100
@@ -17,4 +17,4 @@
 
 
 #include "../fontprovider/Group/bld.inf"
-#include "../fontutils/group/bld.inf"
+#include "../fontutils/FontUtils/group/bld.inf"