diff options
| -rw-r--r-- | dbaccess/JunitTest_dbaccess_complex.mk | 2 | ||||
| -rw-r--r-- | dbaccess/JunitTest_dbaccess_unoapi.mk | 2 | ||||
| -rw-r--r-- | dbaccess/Library_adabasui.mk | 3 | ||||
| -rw-r--r-- | dbaccess/Library_dba.mk | 3 | ||||
| -rw-r--r-- | dbaccess/Library_dbaxml.mk | 5 | ||||
| -rw-r--r-- | dbaccess/Library_dbmm.mk | 4 | ||||
| -rw-r--r-- | dbaccess/Library_dbui.mk | 12 | ||||
| -rw-r--r-- | dbaccess/Library_sdbt.mk | 4 | ||||
| -rw-r--r-- | reportdesign/JunitTest_reportdesign_complex.mk | 2 | ||||
| -rw-r--r-- | reportdesign/Library_rpt.mk | 3 |
10 files changed, 10 insertions, 30 deletions
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk index ae5bfe385..1de5433ff 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 7b2a17e7a..400f9b250 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 23b12f332..a8ef08cc4 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 17ab59736..58835101a 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 6363ba9ca..337d16a30 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 00852adb3..59923cf48 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 2a60b2063..157dc2775 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 c7bdf0379..d5a7dc070 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 a38f04f54..2edce0036 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 1271ca631..b10c55606 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 \ )) |