gbuildize desktop

13 files changed, 45 insertions, 826 deletions

diff --git a/desktop/win32/source/QuickStart/QuickStart.cpp b/desktop/win32/source/QuickStart/QuickStart.cxx
index 3531c29ea317..3531c29ea317 100755
--- a/desktop/win32/source/QuickStart/QuickStart.cpp
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
diff --git a/desktop/win32/source/QuickStart/makefile.mk b/desktop/win32/source/QuickStart/makefile.mk
deleted file mode 100644
index 41242d849dfb..000000000000
--- a/desktop/win32/source/QuickStart/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sysui
-TARGET=quickstart
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=GUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-# --- Resources ----------------------------------------------------
-
-RCFILES=OOQuickStart.rc
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(OBJ)$/QuickStart.obj
-
-APP1OBJS=$(OBJFILES)
-APP1NOSAL=TRUE
-APP1TARGET=$(TARGET)
-APP1RPATH=BRAND
-.IF "$(COM)"=="GCC"
-APP1STDLIBS=-luuid
-.ELSE
-APP1STDLIBS=comsupp.lib
-.ENDIF
-
-APP1STDLIBS+=$(SHELL32LIB)\
-            $(OLE32LIB)\
-            $(GDI32LIB)\
-            $(OLEAUT32LIB)\
-            $(COMDLG32LIB)\
-            $(KERNEL32LIB)\
-            $(OLEAUT32LIB)
-
-APP1NOSVRES=$(RES)$/$(TARGET).res
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/win32/source/QuickStart/so/makefile.mk b/desktop/win32/source/QuickStart/so/makefile.mk
deleted file mode 100755
index 50154c7d50b2..000000000000
--- a/desktop/win32/source/QuickStart/so/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=sysui
-TARGET=soquickstart
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=GUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-# --- Resources ----------------------------------------------------
-
-.IF "$(LINK_SO)"=="TRUE"
-
-RCFILES=QuickStart.rc
-INCPRE=..
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(OBJ)$/QuickStart.obj
-
-APP1OBJS=$(OBJFILES)
-APP1NOSAL=TRUE
-APP1TARGET=$(TARGET)
-APP1RPATH=BRAND
-.IF "$(COM)"=="GCC"
-APP1STDLIBS=-luuid
-.ELSE
-APP1STDLIBS=comsupp.lib
-.ENDIF
-
-APP1STDLIBS+=$(SHELL32LIB)\
-            $(OLE32LIB)\
-            $(GDI32LIB)\
-            $(OLEAUT32LIB)\
-            $(COMDLG32LIB)\
-            $(KERNEL32LIB)\
-            $(OLEAUT32LIB)
-
-APP1NOSVRES=$(RES)$/$(TARGET).res
-
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/launcher.rc
index c5fcc811d0e2..1ca6fc6984d4 100755
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -69,3 +69,5 @@ VS_VERSION_INFO VERSIONINFO
 			VALUE "Translation", 0x0409, 1252
 		}
 	}
+
+1 ICON PPS(RES_APP_ICON) "\0"
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
deleted file mode 100755
index d08309bbed24..000000000000
--- a/desktop/win32/source/applauncher/makefile.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=desktop
-TARGET=applauncher
-LIBTARGET=NO
-TARGETTYPE=GUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CDEFS+=-DUNICODE
-
-
-OBJFILES= \
-    $(OBJ)$/launcher.obj \
-    $(OBJ)$/swriter.obj \
-    $(OBJ)$/scalc.obj \
-    $(OBJ)$/sdraw.obj \
-    $(OBJ)$/simpress.obj \
-    $(OBJ)$/sbase.obj \
-    $(OBJ)$/smath.obj \
-    $(OBJ)$/sweb.obj
-
-# SO launcher
-.IF "$(LINK_SO)"=="TRUE"
-.IF "$(BUILD_SPECIAL)"!=""
-APP1DEPN= $(APP1RES) verinfo.rc
-APP1TARGET=so$/swriter
-APP1NOSAL=TRUE
-APP1LINKRES=$(MISC)$/$(TARGET)1.res
-APP1ICON=$(SOLARRESDIR)$/icons/so9_writer_app.ico
-APP1OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/swriter.obj
-APP1STDLIBS = $(SHELL32LIB)
-APP1VERINFO=verinfo.rc
-APP1PRODUCTDEF+=-DRES_APP_NAME=swriter
-
-APP2TARGET=so$/scalc
-APP2NOSAL=TRUE
-APP2LINKRES=$(MISC)$/$(TARGET)2.res
-APP2ICON=$(SOLARRESDIR)$/icons/so9_calc_app.ico
-APP2OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/scalc.obj
-APP2STDLIBS = $(SHELL32LIB)
-APP2DEPN=verinfo.rc
-APP2VERINFO=verinfo.rc
-APP2PRODUCTDEF+=-DRES_APP_NAME=scalc
-
-APP3TARGET=so$/sdraw
-APP3NOSAL=TRUE
-APP3LINKRES=$(MISC)$/$(TARGET)3.res
-APP3ICON=$(SOLARRESDIR)$/icons/so9_draw_app.ico
-APP3OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sdraw.obj
-APP3STDLIBS = $(SHELL32LIB)
-APP3DEPN=verinfo.rc
-APP3VERINFO=verinfo.rc
-APP3PRODUCTDEF+=-DRES_APP_NAME=sdraw
-
-APP4TARGET=so$/simpress
-APP4NOSAL=TRUE
-APP4LINKRES=$(MISC)$/$(TARGET)4.res
-APP4ICON=$(SOLARRESDIR)$/icons/so9_impress_app.ico
-APP4OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/simpress.obj
-APP4STDLIBS = $(SHELL32LIB)
-APP4DEPN=verinfo.rc
-APP4VERINFO=verinfo.rc
-APP4PRODUCTDEF+=-DRES_APP_NAME=simpress
-
-APP5TARGET=so$/sbase
-APP5NOSAL=TRUE
-APP5LINKRES=$(MISC)$/$(TARGET)5.res
-APP5ICON=$(SOLARRESDIR)$/icons/so9_base_app.ico
-APP5OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sbase.obj
-APP5STDLIBS = $(SHELL32LIB)
-APP5DEPN=verinfo.rc
-APP5VERINFO=verinfo.rc
-APP5PRODUCTDEF+=-DRES_APP_NAME=sbase
-
-APP6TARGET=so$/smath
-APP6NOSAL=TRUE
-APP6LINKRES=$(MISC)$/$(TARGET)6.res
-APP6ICON=$(SOLARRESDIR)$/icons/so9_math_app.ico
-APP6OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/smath.obj
-APP6STDLIBS = $(SHELL32LIB)
-APP6DEPN=verinfo.rc
-APP6VERINFO=verinfo.rc
-APP6PRODUCTDEF+=-DRES_APP_NAME=smath
-
-APP7TARGET=so$/sweb
-APP7NOSAL=TRUE
-APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/so9_writer_app.ico
-APP7OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sweb.obj
-APP7STDLIBS = $(SHELL32LIB)
-APP7DEPN=verinfo.rc
-APP7VERINFO=verinfo.rc
-APP7PRODUCTDEF+=-DRES_APP_NAME=sweb
-
-
-.ENDIF # "$(BUILD_SPECIAL)"!=""
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
deleted file mode 100755
index 02f240cce9e0..000000000000
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ /dev/null
@@ -1,130 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=desktop
-TARGET=applauncher
-LIBTARGET=NO
-TARGETTYPE=GUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET=swriter
-APP1DEPN=verinfo.rc
-APP1VERINFO=verinfo.rc
-APP1NOSAL=TRUE
-APP1LINKRES=$(MISC)$/$(TARGET)1.res
-APP1ICON=$(SOLARRESDIR)$/icons/ooo3_writer_app.ico
-APP1OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/swriter.obj
-APP1STDLIBS = $(SHELL32LIB)
-APP1PRODUCTDEF+=-DRES_APP_NAME=$(APP1TARGET)
-
-APP2TARGET=scalc
-APP2DEPN=verinfo.rc
-APP2VERINFO=verinfo.rc
-APP2NOSAL=TRUE
-APP2LINKRES=$(MISC)$/$(TARGET)2.res
-APP2ICON=$(SOLARRESDIR)$/icons/ooo3_calc_app.ico
-APP2OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/scalc.obj
-APP2STDLIBS = $(SHELL32LIB)
-APP2PRODUCTDEF+=-DRES_APP_NAME=$(APP2TARGET)
-
-APP3TARGET=sdraw
-APP3DEPN=verinfo.rc
-APP3VERINFO=verinfo.rc
-APP3NOSAL=TRUE
-APP3LINKRES=$(MISC)$/$(TARGET)3.res
-APP3ICON=$(SOLARRESDIR)$/icons/ooo3_draw_app.ico
-APP3OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sdraw.obj
-APP3STDLIBS = $(SHELL32LIB)
-APP3PRODUCTDEF+=-DRES_APP_NAME=$(APP3TARGET)
-
-APP4TARGET=simpress
-APP4DEPN=verinfo.rc
-APP4VERINFO=verinfo.rc
-APP4NOSAL=TRUE
-APP4LINKRES=$(MISC)$/$(TARGET)4.res
-APP4ICON=$(SOLARRESDIR)$/icons/ooo3_impress_app.ico
-APP4OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/simpress.obj
-APP4STDLIBS = $(SHELL32LIB)
-APP4PRODUCTDEF+=-DRES_APP_NAME=$(APP4TARGET)
-
-APP5TARGET=smath
-APP5DEPN=verinfo.rc
-APP5VERINFO=verinfo.rc
-APP5NOSAL=TRUE
-APP5LINKRES=$(MISC)$/$(TARGET)5.res
-APP5ICON=$(SOLARRESDIR)$/icons/ooo3_math_app.ico
-APP5OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/smath.obj
-APP5STDLIBS = $(SHELL32LIB)
-APP5PRODUCTDEF+=-DRES_APP_NAME=$(APP5TARGET)
-
-APP6TARGET=sbase
-APP6DEPN=verinfo.rc
-APP6VERINFO=verinfo.rc
-APP6NOSAL=TRUE
-APP6LINKRES=$(MISC)$/$(TARGET)6.res
-APP6ICON=$(SOLARRESDIR)$/icons/ooo3_base_app.ico
-APP6OBJS = \
-        $(OBJ)$/launcher.obj\
-       $(OBJ)$/sbase.obj
-APP6STDLIBS = $(SHELL32LIB)
-APP6PRODUCTDEF+=-DRES_APP_NAME=$(APP6TARGET)
-
-APP7TARGET=sweb
-APP7DEPN=verinfo.rc
-APP7VERINFO=verinfo.rc
-APP7NOSAL=TRUE
-APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/ooo3_writer_app.ico
-APP7OBJS = \
-        $(OBJ)$/launcher.obj\
-       $(OBJ)$/sweb.obj
-APP7STDLIBS = $(SHELL32LIB)
-APP7PRODUCTDEF+=-DRES_APP_NAME=$(APP7TARGET)
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
deleted file mode 100755
index afb58f3a377c..000000000000
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************/
-
-#define VER_FIRSTYEAR	2009
-
-#include <windows.h>
-#include "version_so.hrc"
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO versioninfo
-#ifndef SUBVERSION
-	fileversion    VERSION, 0, VERVARIANT, VER_COUNT
-	productversion VERSION, 0, VERVARIANT, VER_COUNT
-#else
-	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
-	fileflagsmask 0x3F
-	fileflags
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-	fileos VOS_NT_WINDOWS32
-	filetype VFT_APP
-	{
-		block "StringFileInfo"
-		{
-			block "040904E4"
-			{
-				// International StringTable
-				value "CompanyName", 		"The Document Foundation\0"
-				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "ProductVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
-				value "InternalName",		PPS(RES_APP_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
-			}
-		}
-
-		block "VarFileInfo"
-		{
-			value "Translation", 0x0409, 1252
-		}
-	}
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
deleted file mode 100755
index 7912471fba13..000000000000
--- a/desktop/win32/source/guiloader/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=desktop
-TARGET=guiloader
-LIBTARGET=NO
-TARGETTYPE=GUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET=guiloader
-APP1NOSAL=TRUE
-APP1ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
-APP1OBJS=\
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/genericloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB1=$(SHLWAPILIB)
-
-.IF "$(LINK_SO)"=="TRUE"
-APP2TARGET=so$/guiloader
-APP2NOSAL=TRUE
-APP2ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
-APP2OBJS=\
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/genericloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB2=$(SHLWAPILIB)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/guistdio/makefile.mk b/desktop/win32/source/guistdio/makefile.mk
deleted file mode 100755
index 660a48bcdca9..000000000000
--- a/desktop/win32/source/guistdio/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=desktop
-TARGET=guistdio
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=CUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(APP1OBJS) $(APP2OBJS)
-
-APP1NOSAL=TRUE
-APP1OBJS=$(OBJ)$/guistdio.obj
-APP1TARGET=$(TARGET)
-
-APP2NOSAL=TRUE
-APP2OBJS=$(OBJ)$/unopkgio.obj
-APP2TARGET=unopkgio
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
deleted file mode 100755
index b74ffc8f3213..000000000000
--- a/desktop/win32/source/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=desktop
-TARGET=sowrap
-LIBTARGET=NO
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-# --- Files --------------------------------------------------------
-
-OBJFILES = \
-        $(OBJ)$/wrapperw.obj \
-        $(OBJ)$/lwrapw.obj \
-        $(OBJ)$/rwrapw.obj \
-        $(OBJ)$/sowrapper.obj \
-        $(OBJ)$/extendloaderenvironment.obj \
-        $(OBJ)$/unoinfo.obj
-
-APP1TARGET = unoinfo
-APP1OBJS = $(OBJ)$/unoinfo.obj $(SOLARLIBDIR)$/pathutils-obj.obj
-APP1STDLIBS =
-APP1RPATH = BRAND
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
deleted file mode 100755
index 5609dea25085..000000000000
--- a/desktop/win32/source/officeloader/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=desktop
-TARGET=officeloader
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES = \
-        $(OBJ)$/officeloader.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/desktop/win32/source/setup/Makefile b/desktop/win32/source/setup/Makefile
new file mode 100644
index 000000000000..c5337ee8f272
--- /dev/null
+++ b/desktop/win32/source/setup/Makefile
@@ -0,0 +1,43 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+DESTDIR := $(WORKDIR)/CustomTarget/desktop/win32/source/setup
+ifneq ($(WITH_LANG),)
+# TODO: how the localized version is made?
+ULF := setup.ulf
+else
+ULF := setup.ulf
+endif
+
+$(DESTDIR)/loader2.rc : $(ULF) rcfooter.txt rcheader.txt rctmpl.txt
+	lngconvex.exe -ulf $(ULF) -rc $@ -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+
+.DEFAULT_TARGET := all
+.PHONY : all
+all : $(DESTDIR)/loader2.rc
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
deleted file mode 100644
index f0c6e0e955fd..000000000000
--- a/desktop/win32/source/setup/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME		=	desktop
-TARGET		=	loader2
-LIBTARGET	=	NO
-DYNAMIC_CRT	=
-TARGETTYPE	=	GUI
-
-ENABLE_EXCEPTIONS	=	TRUE
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein -----------------------------------------------------------
-
-INCPRE+=$(MFC_INCLUDE)
-
-.IF "$(USE_DEBUG_RUNTIME)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
-
-RCFILES=	$(RES)$/$(TARGET).rc
-
-ULFFILES=	setup.ulf
-
-.IF "$(WITH_LANG)"!=""
-ULFDIR:=$(COMMONMISC)$/$(TARGET)
-.ELSE			# "$(WITH_LANG)"!=""
-ULFDIR:=.
-.ENDIF			# "$(WITH_LANG)"!=""
-
-OBJFILES= 	$(OBJ)$/setup_main.obj \
-            $(OBJ)$/setup_w.obj
-
-# --- Targets ------------------------------------------------------
-# Generate the native Windows resource file
-# using lngconvex.exe 
-
-UWINAPILIB=		$(0)
-LIBSALCPPRT=	$(0)
-
-APP1NOSAL=		TRUE
-APP1TARGET=		loader2
-
-APP1STDLIBS=	$(GDI32LIB) $(ADVAPI32LIB) $(SHELL32LIB) $(MSILIB)
-.IF "$(COM)"!="GCC"
-APP1STDLIBS+=	libcmt.lib
-.ENDIF
-APP1OBJS=		$(OBJFILES)
-
-APP1DEF=		$(MISC)$/$(TARGET).def
-
-APP1RES=		$(RES)$/$(TARGET).res
-APP1NOSVRES=	$(RES)$/$(TARGET).res
-
-# --- setup --------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(RCFILES) : $(ULFDIR)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-    $(LNGCONVEX) -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-