You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:55:09 UTC
svn commit: r1409576 - in /incubator/ooo/branches/gbuild/main: dbaccess/
postprocess/packcomponents/ reportdesign/
Author: arist
Date: Wed Nov 14 23:55:07 2012
New Revision: 1409576
URL: http://svn.apache.org/viewvc?rev=1409576&view=rev
Log:
gnumake4_091_76c825726ff2.patch
# HG changeset patch
# User Ocke Janssen [oj] <Oc...@oracle.com>
# Date 1302863016 -7200
# Node ID 76c825726ff285f4a548cdec59fe46d40a3606bb
# Parent a300897dc1b7a0d332748b9f143710bc546db0f3
gnumake4: fix to use new add rules
Modified:
incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk
Modified: incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk Wed Nov 14 23:55:07 2012
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
dbaccess/qa/complex/dbaccess/ApplicationController \
Modified: incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk Wed Nov 14 23:55:07 2012
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
$$(DEFS) \
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk Wed Nov 14 23:55:07 2012
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,ada
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,adabasui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,adabasui,\
-DCOMPMOD_NAMESPACE=adabasui \
))
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk Wed Nov 14 23:55:07 2012
@@ -44,8 +44,7 @@ $(eval $(call gb_Library_set_include,dba
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,dba,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dba,\
-DOOO_DLLIMPLEMENTATION_DBA \
))
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk Wed Nov 14 23:55:07 2012
@@ -44,11 +44,6 @@ $(eval $(call gb_Library_set_include,dba
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,dbaxml,\
- $$(DEFS) \
-))
-
-
$(eval $(call gb_Library_add_linked_libs,dbaxml,\
tl \
svl \
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk Wed Nov 14 23:55:07 2012
@@ -43,10 +43,6 @@ $(eval $(call gb_Library_set_include,dbm
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,dbmm,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,dbmm,\
cppu \
cppuhelper \
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk Wed Nov 14 23:55:07 2012
@@ -45,17 +45,14 @@ $(eval $(call gb_Library_set_include,dbu
))
ifeq ($(SYSTEM_ODBC_HEADERS),TRUE)
-$(eval $(call gb_Library_set_cflags,dbui,\
- $$(CFLAGS) \
- $$(OBJCFLAGS) \
+$(eval $(call gb_Library_add_cflags,dbui,\
-DSYSTEM_ODBC_HEADERS \
))
endif
ifneq ($(WINDOWS_VISTA_PSDK),)
ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_set_defs,dbui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
-DWINDOWS_VISTA_PSDK \
))
@@ -63,7 +60,7 @@ endif
endif
ifeq ($(GUI)$(COM),WNTGCC)
-$(eval $(call gb_Library_set_cflags,dbui,\
+$(eval $(call gb_Library_add_cflags,dbui,\
-fpermissive \
))
endif
@@ -82,8 +79,7 @@ $(eval $(call gb_Library_add_exception_o
endif
endif
-$(eval $(call gb_Library_set_defs,dbui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
))
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk Wed Nov 14 23:55:07 2012
@@ -44,10 +44,6 @@ $(eval $(call gb_Library_set_include,sdb
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,sdbt,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,sdbt,\
tl \
cppuhelper \
Modified: incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 23:55:07 2012
@@ -55,11 +55,17 @@ my_components = \
component/comphelper/util/comphelp \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
+ component/dbaccess/util/dba \
+ component/dbaccess/util/dbu \
+ component/dbaccess/util/sdbt \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
component/linguistic/source/lng \
component/oox/oox \
+ component/reportdesign/util/rpt \
+ component/reportdesign/util/rptui \
+ component/reportdesign/util/rptxml \
component/vbahelper/util/msforms \
component/sax/source/expatwrap/expwrap \
component/sax/source/fastparser/fastsax \
@@ -91,14 +97,12 @@ my_components = \
configmgr \
ctl \
date \
- dba \
dbase \
dbaxml \
dbmm \
dbp \
dbpool2 \
dbtools \
- dbu \
deployment \
deploymentgui \
dlgprov \
@@ -145,7 +149,6 @@ my_components = \
scriptframe \
sd \
sdbc2 \
- sdbt \
sdd \
slideshow \
spl \
Modified: incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk Wed Nov 14 23:55:07 2012
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex))
+$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\
reportdesign/qa/complex/reportdesign/ReportDesignerTest \
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk?rev=1409576&r1=1409575&r2=1409576&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk Wed Nov 14 23:55:07 2012
@@ -44,8 +44,7 @@ $(eval $(call gb_Library_set_include,rpt
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,rpt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,rpt,\
-DREPORTDESIGN_DLLIMPLEMENTATION \
))