Author: damjan
Date: Sun Feb 21 13:13:34 2016
New Revision: 1731526
URL: http://svn.apache.org/viewvc?rev=1731526&view=rev
Log:
Merge r1409402, r1409404, r1409406, r1409408, and r1409411
from branches/gbuild.
Also added build updates for OS/2 (untested).
DOESN'T BUILD
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/offapi/prj/build.lst
openoffice/branches/gbuild-reintegration/main/sc/inc/pch/precompiled_sc.hxx
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 21 13:13:34 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409400
+/incubator/ooo/branches/gbuild:1409313-1409411
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/offapi/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/offapi/prj/build.lst?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/offapi/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/offapi/prj/build.lst Sun Feb
21 13:13:34 2016
@@ -1 +1,2 @@
oa offapi : udkapi idlc solenv NULL
+oa offapi/prj
nmake - all oa_mkout NULL
Modified:
openoffice/branches/gbuild-reintegration/main/sc/inc/pch/precompiled_sc.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sc/inc/pch/precompiled_sc.hxx?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sc/inc/pch/precompiled_sc.hxx
(original)
+++ openoffice/branches/gbuild-reintegration/main/sc/inc/pch/precompiled_sc.hxx
Sun Feb 21 13:13:34 2016
@@ -60,79 +60,79 @@
#include <cwchar>
#include <float.h>
#include <functional>
-#include <offuh/com/sun/star/awt/Point.hdl>
-#include <offuh/com/sun/star/awt/Point.hpp>
-#include <offuh/com/sun/star/awt/Size.hdl>
-#include <offuh/com/sun/star/awt/Size.hpp>
-#include <offuh/com/sun/star/beans/PropertyVetoException.hdl>
-#include <offuh/com/sun/star/beans/PropertyVetoException.hpp>
-#include <offuh/com/sun/star/container/ElementExistException.hdl>
-#include <offuh/com/sun/star/container/ElementExistException.hpp>
-#include <offuh/com/sun/star/container/NoSuchElementException.hpp>
-#include <offuh/com/sun/star/container/XElementAccess.hdl>
-#include <offuh/com/sun/star/container/XElementAccess.hpp>
-#include <offuh/com/sun/star/container/XNameAccess.hpp>
-#include <offuh/com/sun/star/datatransfer/DataFlavor.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragGestureEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDragEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDropEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSource.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSource.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceContext.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <offuh/com/sun/star/datatransfer/UnsupportedFlavorException.hdl>
-#include <offuh/com/sun/star/datatransfer/XTransferable.hpp>
-#include <offuh/com/sun/star/drawing/XShape.hpp>
-#include <offuh/com/sun/star/embed/InvalidStorageException.hpp>
-#include <offuh/com/sun/star/embed/StorageWrappedTargetException.hdl>
-#include <offuh/com/sun/star/embed/StorageWrappedTargetException.hpp>
-#include <offuh/com/sun/star/embed/XStorage.hdl>
-#include <offuh/com/sun/star/embed/XStorage.hpp>
-#include <offuh/com/sun/star/io/BufferSizeExceededException.hpp>
-#include <offuh/com/sun/star/io/IOException.hdl>
-#include <offuh/com/sun/star/io/NotConnectedException.hdl>
-#include <offuh/com/sun/star/io/NotConnectedException.hpp>
-#include <offuh/com/sun/star/io/XInputStream.hdl>
-#include <offuh/com/sun/star/io/XInputStream.hpp>
-#include <offuh/com/sun/star/io/XOutputStream.hdl>
-#include <offuh/com/sun/star/io/XOutputStream.hpp>
-#include <offuh/com/sun/star/io/XStream.hdl>
-#include <offuh/com/sun/star/lang/EventObject.hdl>
-#include <offuh/com/sun/star/lang/IllegalArgumentException.hpp>
-#include <offuh/com/sun/star/lang/WrappedTargetException.hdl>
-#include <offuh/com/sun/star/lang/WrappedTargetException.hpp>
-#include <offuh/com/sun/star/lang/XComponent.hpp>
-#include <offuh/com/sun/star/lang/XEventListener.hpp>
-#include <offuh/com/sun/star/packages/NoEncryptionException.hdl>
-#include <offuh/com/sun/star/packages/NoEncryptionException.hpp>
-#include <offuh/com/sun/star/packages/WrongPasswordException.hdl>
-#include <offuh/com/sun/star/packages/WrongPasswordException.hpp>
-#include <offuh/com/sun/star/uno/Exception.hdl>
-#include <offuh/com/sun/star/uno/Exception.hpp>
-#include <offuh/com/sun/star/uno/RuntimeException.hdl>
-#include <offuh/com/sun/star/uno/RuntimeException.hpp>
-#include <offuh/com/sun/star/uno/XAdapter.hdl>
-#include <offuh/com/sun/star/uno/XAdapter.hpp>
-#include <offuh/com/sun/star/uno/XInterface.hdl>
-#include <offuh/com/sun/star/uno/XReference.hdl>
-#include <offuh/com/sun/star/uno/XReference.hpp>
-#include <offuh/com/sun/star/uno/XWeak.hpp>
+#include <com/sun/star/awt/Point.hdl>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hdl>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/beans/PropertyVetoException.hdl>
+#include <com/sun/star/beans/PropertyVetoException.hpp>
+#include <com/sun/star/container/ElementExistException.hdl>
+#include <com/sun/star/container/ElementExistException.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
+#include <com/sun/star/container/XElementAccess.hdl>
+#include <com/sun/star/container/XElementAccess.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/datatransfer/DataFlavor.hdl>
+#include <com/sun/star/datatransfer/dnd/DragGestureEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DragSourceEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSource.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
+#include <com/sun/star/datatransfer/UnsupportedFlavorException.hdl>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/embed/InvalidStorageException.hpp>
+#include <com/sun/star/embed/StorageWrappedTargetException.hdl>
+#include <com/sun/star/embed/StorageWrappedTargetException.hpp>
+#include <com/sun/star/embed/XStorage.hdl>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <com/sun/star/io/IOException.hdl>
+#include <com/sun/star/io/NotConnectedException.hdl>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <com/sun/star/io/XInputStream.hdl>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hdl>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XStream.hdl>
+#include <com/sun/star/lang/EventObject.hdl>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/WrappedTargetException.hdl>
+#include <com/sun/star/lang/WrappedTargetException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hdl>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/packages/WrongPasswordException.hdl>
+#include <com/sun/star/packages/WrongPasswordException.hpp>
+#include <com/sun/star/uno/Exception.hdl>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/RuntimeException.hdl>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/XAdapter.hdl>
+#include <com/sun/star/uno/XAdapter.hpp>
+#include <com/sun/star/uno/XInterface.hdl>
+#include <com/sun/star/uno/XReference.hdl>
+#include <com/sun/star/uno/XReference.hpp>
+#include <com/sun/star/uno/XWeak.hpp>
#include <osl/endian.h>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
Sun Feb 21 13:13:34 2016
@@ -464,6 +464,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/
gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
Sun Feb 21 13:13:34 2016
@@ -639,4 +639,17 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGVIEWTARGET)
+
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
Sun Feb 21 13:13:34 2016
@@ -405,6 +405,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/
gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
Sun Feb 21 13:13:34 2016
@@ -762,6 +762,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/
gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
Sun Feb 21 13:13:34 2016
@@ -701,6 +701,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/
gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin
$(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
Modified: openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk Sun
Feb 21 13:13:34 2016
@@ -27,13 +27,17 @@ $(eval $(call gb_Library_set_componentfi
$(eval $(call gb_Library_set_include,unordf,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,unordf,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,unordf,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,unordf,\
cppuhelper \
cppu \
Modified: openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk?rev=1731526&r1=1731525&r2=1731526&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk Sun
Feb 21 13:13:34 2016
@@ -27,13 +27,17 @@ $(eval $(call gb_Library_set_componentfi
$(eval $(call gb_Library_set_include,unoxml,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,unoxml,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,unoxml,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,unoxml,\
ucbhelper \
sax \
