Author: arist
Date: Wed Nov 14 23:54:31 2012
New Revision: 1409575
URL: http://svn.apache.org/viewvc?rev=1409575&view=rev
Log:
gnumake4_089_a75d5667430f.patch
# HG changeset patch
# User Ocke Janssen [oj] <ocke.jans...@oracle.com>
# Date 1302768675 -7200
# Node ID a75d5667430f0c65dcf6df76d6e2d5368cb19197
# Parent 773e91134b5939c75e248081f92decd29cbe8c6c
gnumake4: added dbaccess and reportdesign
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/connectivity/source/cpool/Zregistration.cxx
incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409575&r1=1409574&r2=1409575&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 23:54:31 2012
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,o
canvas \
comphelper \
cppcanvas \
+ dbaccess \
drawinglayer \
editeng \
framework \
@@ -38,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,o
oovbaapi \
oox \
padmin \
+ reportdesign \
sax \
sfx2 \
sot \
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409575&r1=1409574&r2=1409575&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 23:54:31 2012
@@ -40,6 +40,8 @@ $(eval $(call gb_Helper_register_executa
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
+ adabas \
+ adabasui \
agg \
avmedia \
basebmp \
@@ -47,10 +49,19 @@ $(eval $(call gb_Helper_register_librari
canvastools \
cppcanvas \
cui \
+ dba \
+ dbaxml \
+ dbmm \
+ dbui \
+ dbpool \
+ dbtools \
desktop_detector \
drawinglayer \
svgio \
editeng \
+ file \
+ for \
+ forui \
fwe \
fwi \
fwk \
@@ -60,10 +71,17 @@ $(eval $(call gb_Helper_register_librari
lng \
msfilter \
msword \
+ odbc \
+ odbcbase \
oox \
qstart_gtk \
+ rpt \
+ rptui \
+ rptxml \
sax \
sb \
+ sdbc \
+ sdbt \
sfx \
sm \
smd \
Modified:
incubator/ooo/branches/gbuild/main/connectivity/source/cpool/Zregistration.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/connectivity/source/cpool/Zregistration.cxx?rev=1409575&r1=1409574&r2=1409575&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/connectivity/source/cpool/Zregistration.cxx
(original)
+++
incubator/ooo/branches/gbuild/main/connectivity/source/cpool/Zregistration.cxx
Wed Nov 14 23:54:31 2012
@@ -40,13 +40,13 @@ extern "C"
{
//---------------------------------------------------------------------------------------
- void SAL_CALL component_getImplementationEnvironment(const sal_Char**
_ppEnvTypeName, uno_Environment** /*_ppEnv*/)
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName,
uno_Environment** /*_ppEnv*/)
{
*_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
-void* SAL_CALL component_getFactory(const sal_Char* _pImplName,
::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void*
/*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char*
_pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager,
void* /*_pRegistryKey*/)
{
void* pRet = NULL;
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk?rev=1409575&r1=1409574&r2=1409575&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk Wed Nov 14
23:54:31 2012
@@ -81,6 +81,7 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_exception_objects \
add_noexception_objects \
+ set_yaccflags \
add_cflags \
set_cflags \
add_cxxflags \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk?rev=1409575&r1=1409574&r2=1409575&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk Wed Nov 14
23:54:31 2012
@@ -74,6 +74,7 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ set_yaccflags \
add_cflags \
set_cflags \
add_cxxflags \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk?rev=1409575&r1=1409574&r2=1409575&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk Wed Nov 14
23:54:31 2012
@@ -110,6 +110,7 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ set_yaccflags \
add_cflags \
set_cflags \
add_cxxflags \
