--- a/group/bld.inf	Fri Sep 17 08:31:21 2010 +0300
+++ b/group/bld.inf	Mon Nov 01 12:37:49 2010 +0200
@@ -1,46 +1,45 @@
-/*
-* Copyright (c) 2006 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"
-* 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:      upnpservices build file
-*
-*/
-
-
-
-
-
-// For compatibility with S60 3.2 and IAD branch
-#include "upnpplatformvar.hrh"
-
-// Export domain and SDK headers
-#include "../dlnasrv_plat/group/bld.inf"
-
-// upnp stack
-#include "../upnpavcontrolpoint/group/bld.inf"
-#include "../upnpmediaserver/group/bld.inf"
-
-// upnp framework
-#include "../upnpavcontroller/group/bld.inf"
-#include "../upnpframework/group/bld.inf"
-#include "../upnpsettings/group/bld.inf"
-#include "../upnpsharing/group/bld.inf"
-#include "../upnpmpxplugins/group/bld.inf"
-
-#ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
-#include "../upnpharvester/group/bld.inf"
-
-// upnp applications
-#include "../homesync/group/bld.inf"
-#include "../homemedia/group/bld.inf"
-#endif // FF_UPNP_FRAMEWORK_2_0
-// End of file
+/*
+* Copyright (c) 2006 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"
+* 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:      upnpservices build file
+*
+*/
+
+// For compatibility with S60 3.2 and IAD branch
+#include "upnpplatformvar.hrh"
+
+PRJ_EXPORTS
+
+// --------------------------------------------------------------------------
+// Build the dlnasrv package's collections
+// --------------------------------------------------------------------------
+
+// Build the upnpmediaserver collection
+#include "../upnpmediaserver/group/bld.inf"
+
+// Build the upnpavcontroller collection
+#include "../upnpavcontroller/group/bld.inf"
+
+// Build the upnpframework collection
+#include "../upnpframework/group/bld.inf"
+
+// Build the upnpsettings collection
+#include "../upnpsettings/group/bld.inf"
+
+// Build the upnpsharing collection
+#include "../upnpsharing/group/bld.inf"
+
+// Export the platform headers
+#include "../dlnasrv_plat/group/bld.inf"
+
+// End of file