From c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 7 Apr 2012 23:22:08 +0200 Subject: gbuild: "use" vs. "add": Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target) --- dbaccess/CppunitTest_dbaccess_macros_test.mk | 8 ++++---- dbaccess/Executable_odbcconfig.mk | 4 ++-- dbaccess/JunitTest_dbaccess_complex.mk | 2 +- dbaccess/JunitTest_dbaccess_unoapi.mk | 2 +- dbaccess/Library_dba.mk | 4 ++-- dbaccess/Library_dbaxml.mk | 4 ++-- dbaccess/Library_dbmm.mk | 4 ++-- dbaccess/Library_dbu.mk | 6 +++--- dbaccess/Library_dbui.mk | 6 +++--- dbaccess/Library_sdbt.mk | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index de72fdf41493..95129467341c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_macros_test, \ dbaccess/qa/extras/macros-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,dbaccess_macros_test, \ +$(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ avmedia \ basegfx \ comphelper \ @@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\ +$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ offapi \ oovbaapi \ udkapi \ @@ -85,12 +85,12 @@ $(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\ $(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,dbaccess_macros_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,dbaccess_macros_test,\ oovbaapi \ types \ )) -$(eval $(call gb_CppunitTest_add_components,dbaccess_macros_test,\ +$(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 60017df403a9..b81dc7376c62 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\ -I$(SRCDIR)/dbaccess/inc \ )) -$(eval $(call gb_Library_add_api,odbcconfig,\ +$(eval $(call gb_Library_use_api,odbcconfig,\ offapi \ udkapi \ )) -$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\ +$(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_STDLIBS) \ )) diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk index 8606bfe4b03f..ad393949b376 100644 --- a/dbaccess/JunitTest_dbaccess_complex.mk +++ b/dbaccess/JunitTest_dbaccess_complex.mk @@ -54,7 +54,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\ dbaccess/qa/complex/dbaccess/TestCase \ )) -$(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\ +$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk index d99951848125..369b66f75a30 100644 --- a/dbaccess/JunitTest_dbaccess_unoapi.mk +++ b/dbaccess/JunitTest_dbaccess_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,dbaccess_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 34100ce03c60..ee7489d30a47 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ )) -$(eval $(call gb_Library_add_api,dba,\ +$(eval $(call gb_Library_use_api,dba,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dba,\ +$(eval $(call gb_Library_use_libraries,dba,\ comphelper \ cppu \ cppuhelper \ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index ea248db20723..093a2eb19e2d 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,dbaxml,\ -I$(SRCDIR)/dbaccess/source/inc \ )) -$(eval $(call gb_Library_add_api,dbaxml,\ +$(eval $(call gb_Library_use_api,dbaxml,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dbaxml,\ +$(eval $(call gb_Library_use_libraries,dbaxml,\ comphelper \ cppu \ cppuhelper \ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index ae690b2a23b9..82782079aee8 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,dbmm,\ -I$(SRCDIR)/dbaccess/inc \ )) -$(eval $(call gb_Library_add_api,dbmm,\ +$(eval $(call gb_Library_use_api,dbmm,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dbmm,\ +$(eval $(call gb_Library_use_libraries,dbmm,\ comphelper \ cppu \ cppuhelper \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 585ad94dfa94..727568e1704f 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(WORKDIR)/inc/dbaccess \ )) -$(eval $(call gb_Library_add_api,dbu,\ +$(eval $(call gb_Library_use_api,dbu,\ offapi \ udkapi \ )) @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\ )) endif -$(eval $(call gb_Library_add_linked_libs,dbu,\ +$(eval $(call gb_Library_use_libraries,dbu,\ comphelper \ cppu \ cppuhelper \ @@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,dbu,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,dbu,\ +$(eval $(call gb_Library_use_libraries,dbu,\ ole32 \ oleaut32 \ uuid \ diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index 84fe364d14ee..a8f6aa2f15d0 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,dbui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,dbui,\ +$(eval $(call gb_Library_use_api,dbui,\ offapi \ udkapi \ )) @@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_defs,dbui,\ -DDBACCESS_DLLIMPLEMENTATION\ )) -$(eval $(call gb_Library_add_linked_libs,dbui,\ +$(eval $(call gb_Library_use_libraries,dbui,\ comphelper \ cppuhelper \ cppu \ @@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\ $(gb_STDLIBS) \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,dbui,\ +$(eval $(call gb_Library_use_libraries,dbui,\ ole32 \ oleaut32 \ uuid \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 7a13d56cf492..d5d82eaf5c91 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,sdbt,\ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ )) -$(eval $(call gb_Library_add_api,sdbt,\ +$(eval $(call gb_Library_use_api,sdbt,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdbt,\ +$(eval $(call gb_Library_use_libraries,sdbt,\ comphelper \ cppu \ cppuhelper \ -- cgit