diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
| commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
| tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /basic | |
| parent | a16060116346533923c607bd406d3fea511b41ec (diff) | |
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)
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/CppunitTest_basic_scanner.mk | 6 | ||||
| -rw-r--r-- | basic/Library_sb.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index e7849e2e8d8e..21e1a826c73e 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -4,10 +4,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \ basic/qa/cppunit/test_scanner \ )) -$(eval $(call gb_CppunitTest_add_library_objects,basic_scanner,sb)) +$(eval $(call gb_CppunitTest_use_library_objects,basic_scanner,sb)) # add a list of all needed libraries here -$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ comphelper \ cppu \ cppuhelper \ @@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \ )) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ oleaut32 \ )) endif diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index fbc4e79798dc..91c0b39c9ad5 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,sb,\ -I$(SRCDIR)/basic/source/inc \ )) -$(eval $(call gb_Library_add_api,sb,\ +$(eval $(call gb_Library_use_api,sb,\ udkapi \ offapi \ oovbaapi \ @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,sb,\ -DBASIC_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sb,\ +$(eval $(call gb_Library_use_libraries,sb,\ comphelper \ cppu \ cppuhelper \ @@ -145,12 +145,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ )) # Uncomment the following line if DBG_TRACE_PROFILING is active in source/inc/sbtrace.hxx -# $(eval $(call gb_Library_add_linked_libs,sb,\ +# $(eval $(call gb_Library_use_libraries,sb,\ canvastools \ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,sb,\ +$(eval $(call gb_Library_use_libraries,sb,\ uwinapi \ oleaut32 \ )) |