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 /slideshow | |
| 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 'slideshow')
| -rw-r--r-- | slideshow/CppunitTest_slideshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/Executable_demoshow.mk | 4 | ||||
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 10 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index d36071493f3e..57821c5725dd 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -46,14 +46,14 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\ )) endif -$(eval $(call gb_CppunitTest_add_api,slideshow,\ +$(eval $(call gb_CppunitTest_use_api,slideshow,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow)) +$(eval $(call gb_CppunitTest_use_library_objects,slideshow,slideshow)) -$(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\ +$(eval $(call gb_CppunitTest_use_libraries,slideshow,\ avmedia \ basegfx \ canvastools \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 1d4cdcf059b0..07e83a845848 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -48,12 +48,12 @@ $(eval $(call gb_Executable_set_defs,demoshow,\ )) endif -$(eval $(call gb_Library_add_api,demoshow,\ +$(eval $(call gb_Library_use_api,demoshow,\ offapi \ udkapi \ )) -$(eval $(call gb_Executable_add_linked_libs,demoshow,\ +$(eval $(call gb_Executable_use_libraries,demoshow,\ basegfx \ comphelper \ cppcanvas \ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 96eef6979e4a..431b63c57323 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -43,12 +43,12 @@ $(eval $(call gb_Library_add_defs,OGLTrans,\ )) endif -$(eval $(call gb_Library_add_api,OGLTrans,\ +$(eval $(call gb_Library_use_api,OGLTrans,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ canvastools \ comphelper \ cppu \ @@ -75,14 +75,14 @@ $(eval $(call gb_Library_add_objcxxobjects,OGLTrans,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ Cocoa \ GLUT \ OpenGL \ )) else ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ gdi32 \ glu32 \ opengl32 \ @@ -101,7 +101,7 @@ $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl \ )) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ GL \ GLU \ X11 \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 9fcb1608b944..38b3fe2ef9b1 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -43,13 +43,13 @@ $(eval $(call gb_Library_add_defs,slideshow,\ )) endif -$(eval $(call gb_Library_add_api,slideshow,\ +$(eval $(call gb_Library_use_api,slideshow,\ animations \ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,slideshow,\ +$(eval $(call gb_Library_use_libraries,slideshow,\ avmedia \ basegfx \ canvastools \ |