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) --- canvas/Library_cairocanvas.mk | 8 ++++---- canvas/Library_canvasfactory.mk | 4 ++-- canvas/Library_canvastools.mk | 8 ++++---- canvas/Library_directx9canvas.mk | 8 ++++---- canvas/Library_gdipluscanvas.mk | 8 ++++---- canvas/Library_nullcanvas.mk | 4 ++-- canvas/Library_simplecanvas.mk | 4 ++-- canvas/Library_vclcanvas.mk | 4 ++-- canvas/StaticLibrary_directxcanvas.mk | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'canvas') diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 8e4f43d7623b..d7d09e62c57f 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,cairocanvas,\ +$(eval $(call gb_Library_use_api,cairocanvas,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_cxxflags,cairocanvas,\ endif -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ +$(eval $(call gb_Library_use_libraries,cairocanvas,\ sal \ cppu \ basegfx \ @@ -99,7 +99,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_win32_cairo \ )) -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ +$(eval $(call gb_Library_use_libraries,cairocanvas,\ gdi32 \ )) @@ -115,7 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ )) # freetype? fontconfig? -> test on Solaris -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ +$(eval $(call gb_Library_use_libraries,cairocanvas,\ X11 \ Xrender \ )) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index bdd5a7ef6cbc..cbdb02ce81a1 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,canvasfactory,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,canvasfactory,\ +$(eval $(call gb_Library_use_api,canvasfactory,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,canvasfactory,\ +$(eval $(call gb_Library_use_libraries,canvasfactory,\ cppu \ cppuhelper \ sal \ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 5d121f5136d9..4ab7ab86e885 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,canvastools,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,canvastools,\ +$(eval $(call gb_Library_use_api,canvastools,\ offapi \ udkapi \ )) @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,canvastools,\ -DCANVASTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,canvastools,\ +$(eval $(call gb_Library_use_libraries,canvastools,\ basegfx \ comphelper \ cppu \ @@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/bitmap \ canvas/source/tools/image \ )) -$(eval $(call gb_Library_add_linked_libs,canvastools,\ +$(eval $(call gb_Library_use_libraries,canvastools,\ agg \ )) ifneq ($(strip $(AGG_VERSION)),) @@ -88,7 +88,7 @@ endif endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,canvastools,\ +$(eval $(call gb_Library_use_libraries,canvastools,\ winmm \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 0b1da59e8770..ab9ec64a59d4 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,directx9canvas,\ +$(eval $(call gb_Library_use_api,directx9canvas,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\ -UNOMINMAX \ )) -$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ +$(eval $(call gb_Library_use_libraries,directx9canvas,\ cppu \ tk \ sal \ @@ -61,13 +61,13 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ +$(eval $(call gb_Library_use_libraries,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ )) -$(eval $(call gb_Library_add_linked_static_libs,directx9canvas,\ +$(eval $(call gb_Library_use_static_libraries,directx9canvas,\ directxcanvas \ )) diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 3be70e5848cb..f3ddcb8ddf3f 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,gdipluscanvas,\ +$(eval $(call gb_Library_use_api,gdipluscanvas,\ offapi \ udkapi \ )) @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\ )) endif -$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ +$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ cppu \ tk \ sal \ @@ -67,12 +67,12 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ +$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ gdi32 \ gdiplus \ )) -$(eval $(call gb_Library_add_linked_static_libs,gdipluscanvas,\ +$(eval $(call gb_Library_use_static_libraries,gdipluscanvas,\ directxcanvas \ )) diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 24050ff43abb..42260bf4aa11 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,nullcanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,nullcanvas,\ +$(eval $(call gb_Library_use_api,nullcanvas,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,nullcanvas,\ +$(eval $(call gb_Library_use_libraries,nullcanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index fb70e90bc21e..a76bfafb6013 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,simplecanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,simplecanvas,\ +$(eval $(call gb_Library_use_api,simplecanvas,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,simplecanvas,\ +$(eval $(call gb_Library_use_libraries,simplecanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 344f8da5490b..43cdc961877a 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,vclcanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,vclcanvas,\ +$(eval $(call gb_Library_use_api,vclcanvas,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vclcanvas,\ +$(eval $(call gb_Library_use_libraries,vclcanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index c4ff2b633b1b..232429cb7c4a 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -32,7 +32,7 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_StaticLibrary_add_api,directxcanvas,\ +$(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ offapi \ udkapi \ )) -- cgit