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 /Library_merged.mk | |
| 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 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index cbd016bfb960..c40343d69330 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_Library,merged)) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ basegfx \ comphelper \ cppu \ @@ -58,12 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\ endif # gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk -$(eval $(call gb_Library_add_library_objects,merged,\ +$(eval $(call gb_Library_use_library_objects,merged,\ $(gb_MERGEDLIBS) \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ advapi32 \ gdi32 \ ole32 \ @@ -76,14 +76,14 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ endif ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ objc \ Cocoa \ )) endif ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ objc \ Cocoa \ )) |