Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
l10ntools/scripts/localize.pl
l10ntools/source/directory.cxx
l10ntools/source/srciter.cxx
padmin/Executable_spadmin.bin.mk
padmin/Library_spa.mk
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/grfmgr.hxx
svtools/source/filter/filter.cxx
svtools/source/filter/filter2.cxx
svtools/source/filter/wmf/emfwr.cxx
svtools/source/filter/wmf/enhwmf.cxx
svtools/source/filter/wmf/winmtf.cxx
svtools/source/filter/wmf/winmtf.hxx
svtools/source/filter/wmf/winwmf.cxx
svtools/source/filter/wmf/wmfwr.cxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/grfmgr2.cxx
toolkit/source/controls/controlmodelcontainerbase.cxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/helper/formpdfexport.cxx
toolkit/source/helper/unowrapper.cxx
vcl/Package_osx.mk
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/app/salsys.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/dtrans/test_aquacb.cxx
vcl/aqua/source/res/makefile.mk
vcl/aqua/source/window/salframe.cxx
vcl/aqua/source/window/salframeview.mm
vcl/inc/aqua/salgdi.h
vcl/inc/aqua/salinst.h
vcl/inc/graphite_adaptors.hxx
vcl/inc/graphite_cache.hxx
vcl/inc/graphite_serverfont.hxx
vcl/inc/impprn.hxx
vcl/inc/svdata.hxx
vcl/inc/unx/i18n_status.hxx
vcl/inc/unx/saldata.hxx
vcl/inc/unx/salfont.h
vcl/inc/unx/salinst.h
vcl/inc/unx/salprn.h
vcl/inc/unx/salsys.h
vcl/inc/unx/sm.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/graph.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/polyscan.hxx
vcl/inc/vcl/svcompat.hxx
vcl/inc/vcl/svgread.hxx
vcl/inc/vcl/unobrok.hxx
vcl/inc/win/salgdi.h
vcl/inc/win/wincomp.hxx
vcl/prj/d.lst
vcl/source/app/dbggui.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/makefile.mk
vcl/source/app/settings.cxx
vcl/source/app/sound.cxx
vcl/source/app/stdtext.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/timer.cxx
vcl/source/app/unohelp.cxx
vcl/source/components/dtranscomp.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ctrl.cxx
vcl/source/control/edit.cxx
vcl/source/control/field2.cxx
vcl/source/control/ilstbox.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/cvtgrf.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/imagerepository.cxx
vcl/source/gdi/impbmp.cxx
vcl/source/gdi/impgraph.cxx
vcl/source/gdi/impimagetree.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev2.cxx
vcl/source/gdi/outdev5.cxx
vcl/source/gdi/outdev6.cxx
vcl/source/gdi/outmap.cxx
vcl/source/gdi/polyscan.cxx
vcl/source/gdi/print.cxx
vcl/source/gdi/print2.cxx
vcl/source/gdi/region.cxx
vcl/source/gdi/salgdilayout.cxx
vcl/source/gdi/sallayout.cxx
vcl/source/gdi/svcompat.cxx
vcl/source/gdi/virdev.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_vdev.cxx
vcl/source/glyphs/gcach_vdev.hxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_serverfont.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/glyphs/makefile.mk
vcl/source/src/makefile.mk
vcl/source/window/accel.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dialog.cxx
vcl/source/window/dndevdis.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/introwin.cxx
vcl/source/window/keycod.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/scrwnd.cxx
vcl/source/window/split.cxx
vcl/source/window/splitwin.cxx
vcl/source/window/status.cxx
vcl/source/window/syswin.cxx
vcl/source/window/tabpage.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/winproc.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/generic/app/i18n_cb.cxx
vcl/unx/generic/app/i18n_ic.cxx
vcl/unx/generic/app/saldata.cxx
vcl/unx/generic/app/saldisp.cxx
vcl/unx/generic/app/salinst.cxx
vcl/unx/generic/app/wmadaptor.cxx
vcl/unx/generic/fontmanager/afm_hash.cpp
vcl/unx/generic/gdi/salbmp.cxx
vcl/unx/generic/gdi/salgdi3.cxx
vcl/unx/generic/gdi/xrender_peer.cxx
vcl/unx/generic/window/salframe.cxx
vcl/unx/generic/window/salobj.cxx
vcl/unx/gtk/a11y/makefile.mk
vcl/unx/gtk/app/gtksys.cxx
vcl/unx/gtk/app/makefile.mk
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde/salnativewidgets-kde.cxx
vcl/unx/kde4/KDESalDisplay.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/KDEXLib.hxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/makefile.mk
vcl/unx/source/app/makefile.mk
vcl/unx/source/fontmanager/makefile.mk
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/inc/salcursors.h
vcl/util/linksvp/makefile.mk
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/app/salshl.cxx
vcl/win/source/gdi/makefile.mk
vcl/win/source/gdi/salbmp.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi2.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salgdi_gdiplus.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/salvd.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salmenu.cxx
vcl/win/source/window/salobj.cxx

3 files changed, 41 insertions, 212 deletions

diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index ea3c074103ab..9e0ccdba440b 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,57 +1,4 @@
 vc	vcl	:	TRANSLATIONS:translations apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
-vc	vcl\inc									nmake	-	all	vc_inc NULL
-vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
-vc	vcl\source\app							nmake	-	all	vc_app vc_inc NULL
-vc	vcl\source\gdi							nmake	-	all	vc_gdi vc_inc NULL
-vc	vcl\source\window						nmake	-	all	vc_win vc_inc NULL
-vc	vcl\source\control						nmake	-	all	vc_ctrl vc_inc NULL
-vc	vcl\source\src							nmake	-	all	vc_src vc_inc NULL
-vc	vcl\source\helper						nmake	-	all	vc_hlp vc_inc NULL
-vc	vcl\source\fontsubset					nmake	-	all	vc_fts vc_inc NULL
-vc  vcl\source\salmain                      nmake   -   all vc_salmain vc_inc NULL
-vc	vcl\os2\source\app						nmake	-	p	vc__appp vc_inc NULL
-vc	vcl\os2\source\gdi						nmake	-	p	vc__gdip vc_inc NULL
-vc	vcl\os2\source\window					nmake	-	p	vc__winp vc_inc NULL
-vc	vcl\os2\source\src						nmake	-	p	vc__srcp vc_inc NULL
-vc  vcl\source\components					nmake	-	all	vc_components vc_inc NULL
-vc	vcl\win\source\app						nmake	-	w	vc__appw vc_inc NULL
-vc	vcl\win\source\gdi						nmake	-	w	vc__gdiw vc_inc NULL
-vc	vcl\win\source\window					nmake	-	w	vc__winw vc_inc NULL
-vc	vcl\win\source\src						nmake	-	w	vc__srcw vc_inc NULL
-vc  vcl\unx\source\plugadapt				nmake	-	u	vc__plug vc_inc NULL
-vc  vcl\unx\source\desktopdetect			nmake	-	u	vc__desk vc_inc NULL
-vc	vcl\unx\source\app						nmake	-	u	vc__appu vc_inc NULL
-vc	vcl\unx\source\dtrans					nmake	-	u	vc__dtru vc_inc NULL
-vc	vcl\unx\source\fontmanager				nmake	-	u	vc__ftmu vc_inc NULL
-vc	vcl\unx\source\gdi						nmake	-	u	vc__gdiu vc_inc NULL
-vc	vcl\unx\source\printer   				nmake	-	u	vc__prnu vc_inc NULL
-vc	vcl\unx\source\printergfx  				nmake	-	u	vc__prgu vc_inc NULL
-vc	vcl\unx\source\window					nmake	-	u	vc__winu vc_inc NULL
-vc  vcl\unx\gtk\a11y						nmake   -   u   vc__gtky vc_inc NULL
-vc  vcl\unx\gtk\app							nmake   -   u   vc__gtka vc_inc NULL
-vc  vcl\unx\gtk\window						nmake   -   u   vc__gtkw vc_inc NULL
-vc  vcl\unx\gtk\gdi 						nmake   -   u   vc__gtkg vc_inc NULL
-vc  vcl\unx\headless						nmake   -   u   vc__hl   vc_inc NULL
-vc  vcl\unx\kde							nmake   -   u   vc__kde  vc_inc NULL
-vc  vcl\unx\kde4							nmake   -   u   vc__kde4  vc_inc NULL
-vc	vcl\aqua\source\a11y					nmake	-	u	vc__aquy vc_inc NULL
-vc	vcl\aqua\source\app						nmake	-	u	vc__appa vc_inc NULL
-vc	vcl\aqua\source\dtrans					nmake	-	u	vc__dtra vc_inc NULL
-vc	vcl\aqua\source\gdi						nmake	-	u	vc__gdia vc_inc NULL
-vc	vcl\aqua\source\res                 nmake   -   u   vc__resa NULL
-vc	vcl\aqua\source\window					nmake	-	u	vc__wina vc_inc NULL
-vc	vcl\mac\source\app						nmake	-	m	vc__appm vc_inc NULL
-vc	vcl\mac\source\gdi						nmake	-	m	vc__gdim vc_inc NULL
-vc	vcl\mac\source\window					nmake	-	m	vc__winm vc_inc NULL
-vc	vcl\mac\source\src						nmake	-	m	vc__srcm vc_inc NULL
-vc	vcl\util								nmake	-	all	vc_util vc__plug.u vc__desk.u vc__aquy.u vc__appa.u vc__dtra.u vc__appm.m vc__appu.u vc__dtru.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__kde4.u vc__hl.u vc__ftmu.u vc__prgu.u vc__prnu.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_fts vc_components NULL
-vc  vcl\util\linksvp                        nmake   -   u   vc_lsvp vc_util NULL
-vc	vcl\workben								nmake	-	all	vc_wrkb vc_util vc_salmain NULL
-
-# memCheck works only within unix
-# memCheck is not right yet
-# vc      vcl\qa\complex\memCheck                  nmake - u   vc_qa_complex vc_util NULL
-# GPF
-# vc      vcl\qa\complex\persistent_window_states  nmake - all vc_qa_complex vc_util NULL
+vc	vcl\prj									nmake	-	all	vc_prj NULL
 
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 00b703cf43b9..44207ff15e12 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1,161 +1,3 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\vcl
-
-..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\bin%_EXT%\*.zip
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\vcl*.res %_DEST%\bin%_EXT%\vcl*.res
-..\%__SRC%\bin\vcl?????.dll %_DEST%\bin%_EXT%\vcl?????.dll
-..\%__SRC%\bin\vcl?????.sym %_DEST%\bin%_EXT%\vcl?????.sym
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\ivcl.lib %_DEST%\lib%_EXT%\ivcl.lib
-..\%__SRC%\misc\vcl?????.map %_DEST%\bin%_EXT%\vcl?????.map
-..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj
-..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o
-..\%__SRC%\lib\libvclmain.a %_DEST%\lib%_EXT%\libvclmain.a
-..\%__SRC%\lib\vclmain.lib %_DEST%\lib%_EXT%\vclmain.lib
-
-..\inc\vcl\accel.hxx %_DEST%\inc%_EXT%\vcl\accel.hxx
-..\inc\vcl\alpha.hxx %_DEST%\inc%_EXT%\vcl\alpha.hxx
-..\inc\vcl\animate.hxx %_DEST%\inc%_EXT%\vcl\animate.hxx
-..\inc\vcl\apptypes.hxx %_DEST%\inc%_EXT%\vcl\apptypes.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
-..\inc\vcl\bitmap.hxx %_DEST%\inc%_EXT%\vcl\bitmap.hxx
-..\inc\vcl\bitmapex.hxx %_DEST%\inc%_EXT%\vcl\bitmapex.hxx
-..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx
-..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx
-..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx
-..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h
-..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx
-..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h
-..\inc\vcl\combobox.hxx %_DEST%\inc%_EXT%\vcl\combobox.hxx
-..\inc\vcl\ctrl.hxx %_DEST%\inc%_EXT%\vcl\ctrl.hxx
-..\inc\vcl\cursor.hxx %_DEST%\inc%_EXT%\vcl\cursor.hxx
-..\inc\vcl\cvtgrf.hxx %_DEST%\inc%_EXT%\vcl\cvtgrf.hxx
-..\inc\vcl\cvtsvm.hxx %_DEST%\inc%_EXT%\vcl\cvtsvm.hxx
-..\inc\vcl\decoview.hxx %_DEST%\inc%_EXT%\vcl\decoview.hxx
-..\inc\vcl\dialog.hxx %_DEST%\inc%_EXT%\vcl\dialog.hxx
-..\inc\vcl\dockingarea.hxx %_DEST%\inc%_EXT%\vcl\dockingarea.hxx
-..\inc\vcl\dockwin.hxx %_DEST%\inc%_EXT%\vcl\dockwin.hxx
-..\inc\vcl\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h
-..\inc\vcl\edit.hxx %_DEST%\inc%_EXT%\vcl\edit.hxx
-..\inc\vcl\event.hxx %_DEST%\inc%_EXT%\vcl\event.hxx
-..\inc\vcl\field.hxx %_DEST%\inc%_EXT%\vcl\field.hxx
-..\inc\vcl\fixbrd.hxx %_DEST%\inc%_EXT%\vcl\fixbrd.hxx
-..\inc\vcl\fixed.hxx %_DEST%\inc%_EXT%\vcl\fixed.hxx
-..\inc\vcl\floatwin.hxx %_DEST%\inc%_EXT%\vcl\floatwin.hxx
-..\inc\vcl\fntstyle.hxx %_DEST%\inc%_EXT%\vcl\fntstyle.hxx
-..\inc\vcl\font.hxx %_DEST%\inc%_EXT%\vcl\font.hxx
 ..\inc\vcl\fontcapabilities.hxx %_DEST%\inc%_EXT%\vcl\fontcapabilities.hxx
-..\inc\vcl\fontcvt.hxx %_DEST%\inc%_EXT%\vcl\fontcvt.hxx
-..\inc\vcl\gdimtf.hxx %_DEST%\inc%_EXT%\vcl\gdimtf.hxx
-..\inc\vcl\gfxlink.hxx %_DEST%\inc%_EXT%\vcl\gfxlink.hxx
-..\inc\vcl\gradient.hxx %_DEST%\inc%_EXT%\vcl\gradient.hxx
-..\inc\vcl\graph.h %_DEST%\inc%_EXT%\vcl\graph.h
-..\inc\vcl\graph.hxx %_DEST%\inc%_EXT%\vcl\graph.hxx
-..\inc\vcl\group.hxx %_DEST%\inc%_EXT%\vcl\group.hxx
-..\inc\vcl\hatch.hxx %_DEST%\inc%_EXT%\vcl\hatch.hxx
-..\inc\vcl\help.hxx %_DEST%\inc%_EXT%\vcl\help.hxx
-..\inc\vcl\image.hxx %_DEST%\inc%_EXT%\vcl\image.hxx
-..\inc\vcl\imagerepository.hxx %_DEST%\inc%_EXT%\vcl\imagerepository.hxx
-..\inc\vcl\imgctrl.hxx %_DEST%\inc%_EXT%\vcl\imgctrl.hxx
-..\inc\vcl\throbber.hxx %_DEST%\inc%_EXT%\vcl\throbber.hxx
-..\inc\vcl\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx
-..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx
-..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx
-..\inc\vcl\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx
-..\unx\inc\kde_headers.h %_DEST%\inc%_EXT%\vcl\kde_headers.h
-..\inc\vcl\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx
-..\inc\vcl\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx
-..\inc\vcl\lineinfo.hxx %_DEST%\inc%_EXT%\vcl\lineinfo.hxx
-..\inc\vcl\longcurr.hxx %_DEST%\inc%_EXT%\vcl\longcurr.hxx
-..\inc\vcl\lstbox.h %_DEST%\inc%_EXT%\vcl\lstbox.h
-..\inc\vcl\lstbox.hxx %_DEST%\inc%_EXT%\vcl\lstbox.hxx
-..\inc\vcl\mapmod.hxx %_DEST%\inc%_EXT%\vcl\mapmod.hxx
-..\inc\vcl\menu.hxx %_DEST%\inc%_EXT%\vcl\menu.hxx
-..\inc\vcl\menubtn.hxx %_DEST%\inc%_EXT%\vcl\menubtn.hxx
-..\inc\vcl\metaact.hxx %_DEST%\inc%_EXT%\vcl\metaact.hxx
-..\inc\vcl\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.hxx
-..\inc\vcl\metric.hxx %_DEST%\inc%_EXT%\vcl\metric.hxx
-..\inc\vcl\mnemonic.hxx %_DEST%\inc%_EXT%\vcl\mnemonic.hxx
-..\inc\vcl\mnemonicengine.hxx %_DEST%\inc%_EXT%\vcl\mnemonicengine.hxx
-..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx
-..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx
-..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx
-..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
-..\inc\vcl\oldprintadaptor.hxx %_DEST%\inc%_EXT%\vcl\oldprintadaptor.hxx
-..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
-..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
-..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
-..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
-..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
-..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx
-..\inc\vcl\regband.hxx %_DEST%\inc%_EXT%\vcl\regband.hxx
-..\inc\vcl\region.hxx %_DEST%\inc%_EXT%\vcl\region.hxx
-..\inc\vcl\salbtype.hxx %_DEST%\inc%_EXT%\vcl\salbtype.hxx
-..\inc\vcl\salctype.hxx %_DEST%\inc%_EXT%\vcl\salctype.hxx
-..\inc\vcl\salgtype.hxx %_DEST%\inc%_EXT%\vcl\salgtype.hxx
-..\inc\vcl\salstype.hxx %_DEST%\inc%_EXT%\vcl\salstype.hxx
-..\inc\vcl\salnativewidgets.hxx %_DEST%\inc%_EXT%\vcl\salnativewidgets.hxx
-..\inc\vcl\scrbar.hxx %_DEST%\inc%_EXT%\vcl\scrbar.hxx
-..\inc\vcl\seleng.hxx %_DEST%\inc%_EXT%\vcl\seleng.hxx
-..\inc\vcl\settings.hxx %_DEST%\inc%_EXT%\vcl\settings.hxx
-..\inc\vcl\slider.hxx %_DEST%\inc%_EXT%\vcl\slider.hxx
-..\inc\vcl\sndstyle.hxx %_DEST%\inc%_EXT%\vcl\sndstyle.hxx
 ..\inc\vcl\solarmutex.hxx %_DEST%\inc%_EXT%\vcl\solarmutex.hxx
-..\inc\vcl\sound.hxx %_DEST%\inc%_EXT%\vcl\sound.hxx
-..\inc\vcl\spin.h %_DEST%\inc%_EXT%\vcl\spin.h
-..\inc\vcl\spin.hxx %_DEST%\inc%_EXT%\vcl\spin.hxx
-..\inc\vcl\spinfld.hxx %_DEST%\inc%_EXT%\vcl\spinfld.hxx
-..\inc\vcl\split.hxx %_DEST%\inc%_EXT%\vcl\split.hxx
-..\inc\vcl\splitwin.hxx %_DEST%\inc%_EXT%\vcl\splitwin.hxx
-..\inc\vcl\status.hxx %_DEST%\inc%_EXT%\vcl\status.hxx
-..\inc\vcl\stdtext.hxx %_DEST%\inc%_EXT%\vcl\stdtext.hxx
-..\inc\vcl\sv.h %_DEST%\inc%_EXT%\vcl\sv.h
-..\inc\vcl\svapp.hxx %_DEST%\inc%_EXT%\vcl\svapp.hxx
-..\inc\vcl\symbol.hxx %_DEST%\inc%_EXT%\vcl\symbol.hxx
-..\inc\vcl\syschild.hxx %_DEST%\inc%_EXT%\vcl\syschild.hxx
-..\inc\vcl\sysdata.hxx %_DEST%\inc%_EXT%\vcl\sysdata.hxx
-..\inc\vcl\syswin.hxx %_DEST%\inc%_EXT%\vcl\syswin.hxx
-..\inc\vcl\tabctrl.hxx %_DEST%\inc%_EXT%\vcl\tabctrl.hxx
-..\inc\vcl\tabdlg.hxx %_DEST%\inc%_EXT%\vcl\tabdlg.hxx
-..\inc\vcl\tabpage.hxx %_DEST%\inc%_EXT%\vcl\tabpage.hxx
-..\inc\vcl\taskpanelist.hxx %_DEST%\inc%_EXT%\vcl\taskpanelist.hxx
-..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx
-..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx
-..\inc\vcl\unowrap.hxx %_DEST%\inc%_EXT%\vcl\unowrap.hxx
-..\inc\vcl\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.hxx
-..\inc\vcl\vclenum.hxx %_DEST%\inc%_EXT%\vcl\vclenum.hxx
-..\inc\vcl\vclevent.hxx %_DEST%\inc%_EXT%\vcl\vclevent.hxx
-..\inc\vcl\virdev.hxx %_DEST%\inc%_EXT%\vcl\virdev.hxx
-..\inc\vcl\waitobj.hxx %_DEST%\inc%_EXT%\vcl\waitobj.hxx
-..\inc\vcl\wall.hxx %_DEST%\inc%_EXT%\vcl\wall.hxx
-..\inc\vcl\window.hxx %_DEST%\inc%_EXT%\vcl\window.hxx
-..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx
-..\inc\vcl\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx
-..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx
-..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx
-..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx
-..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.hxx
-..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx
-..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx
-..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.hxx
-..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx
-..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx
-..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.hxx
-..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx
-..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx
-..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx
-..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx
-..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx
-..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx
-..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx
-..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx
-..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx
-..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
-..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx
-..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
-..\inc\vcl\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx
-..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
 
diff --git a/vcl/prj/makefile.mk b/vcl/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/vcl/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)