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 /padmin | |
| 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 'padmin')
| -rw-r--r-- | padmin/Executable_spadmin.bin.mk | 10 | ||||
| -rw-r--r-- | padmin/Library_spa.mk | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 7dfb7d99a65a..9aca32b3508e 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -32,16 +32,16 @@ $(eval $(call gb_Executable_set_include,spadmin.bin,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\ vclmain \ )) -$(eval $(call gb_Executable_add_api,spadmin.bin,\ +$(eval $(call gb_Executable_use_api,spadmin.bin,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ spa \ svt \ vcl \ @@ -61,13 +61,13 @@ $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ pthread \ )) endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ dl \ )) endif diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index ec6c1e79fcd6..cfae49a93b05 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_add_defs,spa,\ -DSPA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,spa,\ +$(eval $(call gb_Library_use_api,spa,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,spa,\ +$(eval $(call gb_Library_use_libraries,spa,\ svt \ vcl \ utl \ @@ -63,14 +63,14 @@ $(eval $(call gb_Library_add_exception_objects,spa,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_add_linked_libs,spa,\ +$(eval $(call gb_Library_use_libraries,spa,\ m \ pthread \ )) endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,spa,\ +$(eval $(call gb_Library_use_libraries,spa,\ dl \ )) endif |