[Libreoffice-commits] .: Branch 'feature/gnumake4' - 2 commits - dbaccess/JunitTest_dbaccess_complex.mk dbaccess/JunitTest_dbaccess_unoapi.mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbui.mk dbaccess/Library_sdbt.mk reportdesign/JunitTest_reportdesign_complex.mk reportdesign/Library_rpt.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jun 17 06:59:44 PDT 2011
dbaccess/JunitTest_dbaccess_complex.mk | 2 +-
dbaccess/JunitTest_dbaccess_unoapi.mk | 2 +-
dbaccess/Library_adabasui.mk | 3 +--
dbaccess/Library_dba.mk | 3 +--
dbaccess/Library_dbaxml.mk | 5 -----
dbaccess/Library_dbmm.mk | 4 ----
dbaccess/Library_dbui.mk | 13 +++++--------
dbaccess/Library_sdbt.mk | 4 ----
reportdesign/JunitTest_reportdesign_complex.mk | 2 +-
reportdesign/Library_rpt.mk | 3 +--
10 files changed, 11 insertions(+), 30 deletions(-)
New commits:
commit 3d38e81142e7cada1ca64dbde873b082ab1f30f7
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Fri Apr 15 12:23:36 2011 +0200
gnumake4: fix to use new add rules [hg:76c825726ff2]
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index ae5bfe3..1de5433 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -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 \
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 7b2a17e..400f9b2 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -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) \
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index 23b12f3..a8ef08c 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,adabasui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,adabasui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,adabasui,\
-DCOMPMOD_NAMESPACE=adabasui \
))
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 17ab597..5883510 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,dba,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,dba,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dba,\
-DOOO_DLLIMPLEMENTATION_DBA \
))
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 6363ba9..337d16a 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -40,11 +40,6 @@ $(eval $(call gb_Library_set_include,dbaxml,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,dbaxml,\
- $$(DEFS) \
-))
-
-
$(eval $(call gb_Library_add_linked_libs,dbaxml,\
tl \
svl \
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 00852ad..59923cf 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Library_set_include,dbmm,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,dbmm,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,dbmm,\
cppu \
cppuhelper \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 2a60b20..157dc27 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -41,17 +41,14 @@ $(eval $(call gb_Library_set_include,dbui,\
))
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 \
))
@@ -59,7 +56,7 @@ endif
endif
ifeq ($(GUI)$(COM),WNTGCC)
-$(eval $(call gb_Library_set_cflags,dbui,\
+$(eval $(call gb_Library_add_cflags,dbui,\
-fpermissive \
))
endif
@@ -78,8 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
endif
endif
-$(eval $(call gb_Library_set_defs,dbui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
))
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index c7bdf03..d5a7dc0 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -40,10 +40,6 @@ $(eval $(call gb_Library_set_include,sdbt,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sdbt,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,sdbt,\
tl \
cppuhelper \
diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk
index a38f04f..2edce00 100644
--- a/reportdesign/JunitTest_reportdesign_complex.mk
+++ b/reportdesign/JunitTest_reportdesign_complex.mk
@@ -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 \
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 1271ca6..b10c556 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,rpt,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,rpt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,rpt,\
-DREPORTDESIGN_DLLIMPLEMENTATION \
))
commit 5171fed2008da318d0378eb0e0321abf0afb0966
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Apr 14 11:14:42 2011 +0200
gnumake4: new file added [hg:19da0341df50]
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 0077976..2a60b20 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -126,6 +126,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/app/AppSwapWindow \
dbaccess/source/ui/app/AppTitleWindow \
dbaccess/source/ui/app/AppView \
+ dbaccess/source/ui/app/closeveto \
dbaccess/source/ui/app/subcomponentmanager \
dbaccess/source/ui/browser/genericcontroller \
dbaccess/source/ui/browser/dsbrowserDnD \
More information about the Libreoffice-commits
mailing list