CWS gnumake2: merging minibranches

2 files changed, 67 insertions, 2 deletions

diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 4dcebafb0386..8817d4590715 100644
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,4 +1,16 @@
 xo	xmloff	:	offapi svl vos NULL
 xo	xmloff									usr1	-	all	xo_mkout NULL
-xo	xmloff\prj								nmake	-	all	xo_prj NULL
-
+xo	xmloff\prj								get		-	all	xo_prj NULL
+xo	xmloff\inc								nmake	-	all	xo_inc NULL
+xo	xmloff\source\core						nmake	-	all	xo_core xo_inc NULL
+xo	xmloff\source\meta						nmake	-	all	xo_meta xo_inc NULL
+xo	xmloff\source\style						nmake	-	all	xo_style xo_inc NULL
+xo	xmloff\source\text						nmake	-	all	xo_text xo_inc NULL
+xo	xmloff\source\draw						nmake	-	all	xo_draw xo_inc NULL
+xo	xmloff\source\chart						nmake	-	all	xo_chart xo_inc NULL
+xo	xmloff\source\forms						nmake	-	all	xo_forms xo_inc NULL
+xo	xmloff\source\script					nmake	-	all	xo_script xo_inc NULL
+xo  xmloff\source\transform                 nmake   -   all xo_transform xo_util xo_inc NULL
+xo  xmloff\source\xforms                    nmake   -   all xo_xforms xo_inc NULL
+xo  xmloff\source\table						nmake   -   all xo_table xo_inc NULL
+xo  xmloff\util                             nmake   -   all xo_util xo_chart xo_core xo_draw xo_forms xo_meta xo_script xo_style xo_text xo_xforms xo_table NULL
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index 8b137891791f..658ce7454d5b 100644
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -1 +1,54 @@
+mkdir: %_DEST%\inc%_EXT%\xmloff
 
+..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
+..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
+..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
+..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+
+..\dtd\* %_DEST%\bin%_EXT%
+
+..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx
+..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h
+..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx
+..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx
+..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx
+..\inc\xmlkywd.hxx %_DEST%\inc%_EXT%\xmloff\xmlkywd.hxx
+..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx
+..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx
+..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx
+..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx
+..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx
+..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx
+..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx
+..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx
+..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx
+..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx
+..\inc\GradientStyle.hxx %_DEST%\inc%_EXT%\xmloff\GradientStyle.hxx
+..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx
+..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx
+..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx
+..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx
+..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx
+..\inc\xmloff\XMLSettingsExportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLSettingsExportContext.hxx
+..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx
+..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx
+..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx
+..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h
+..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx
+..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx
+..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx
+..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx
+
+..\inc\xmloff\*.hxx %_DEST%\inc%_EXT%\xmloff\*.hxx
+..\inc\xmloff\*.h %_DEST%\inc%_EXT%\xmloff\*.h
+
+..\xml\components.xml %_DEST%\xml%_EXT%\components.xml
+
+mkdir: %_DEST%\inc%_EXT%\xmloff\table
+..\inc\xmloff\table\XMLTableExport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableExport.hxx
+..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx
+
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib