diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:07:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:07:24 +0200 |
| commit | c81f9104b6b6a91588c7a74bbb50a0c9c9729e1a (patch) | |
| tree | be3b7a4178a549d061ca397081fa5589ddbf8d03 /canvas | |
| parent | a233dac0653f3f3054f7ad2da114ed989747e89a (diff) | |
postmerge fixes for gnumake4
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_cairocanvas.mk | 1 | ||||
| -rw-r--r-- | canvas/Library_canvasfactory.mk | 5 | ||||
| -rw-r--r-- | canvas/Library_canvastools.mk | 6 | ||||
| -rw-r--r-- | canvas/Library_directx5canvas.mk | 5 | ||||
| -rw-r--r-- | canvas/Library_directx9canvas.mk | 1 | ||||
| -rw-r--r-- | canvas/Library_gdipluscanvas.mk | 6 | ||||
| -rw-r--r-- | canvas/Library_nullcanvas.mk | 6 | ||||
| -rw-r--r-- | canvas/Library_simplecanvas.mk | 6 | ||||
| -rw-r--r-- | canvas/Library_vclcanvas.mk | 6 |
9 files changed, 33 insertions, 9 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 9fc2db07a1ae..6747bbd9d6e2 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,cairocanvas,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index ce02c19bee28..fb7499c481c6 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -33,9 +33,12 @@ $(eval $(call gb_Library_set_include,canvasfactory,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ )) +$(eval $(call gb_Library_add_api,canvasfactory,\ + offapi \ + udkapi \ +)) $(eval $(call gb_Library_add_linked_libs,canvasfactory,\ cppu \ cppuhelper \ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index dc424edde0e0..9fb63089fd6e 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,canvastools,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,canvastools,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_defs,canvastools,\ diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk index 44139093817f..53205db1cdd4 100644 --- a/canvas/Library_directx5canvas.mk +++ b/canvas/Library_directx5canvas.mk @@ -34,9 +34,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ -I$(SRCDIR)/canvas/source/directx \ - -I$(OUTDIR)/inc/offuh \ )) +$(eval $(call gb_Library_add_api,directx5canvas,\ + offapi \ + udkapi \ +)) $(eval $(call gb_Library_add_defs,directx5canvas,\ -DDIRECTX_VERSION=0x0500 \ )) diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index cb8264d01c8d..a1a08c0b38e3 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,directx9canvas,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_defs,directx9canvas,\ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index f5b2bc32e18e..c18805913c74 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,gdipluscanvas,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_defs,gdipluscanvas,\ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index e17980422bff..4dc59949064b 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -31,7 +31,11 @@ $(eval $(call gb_Library_set_include,nullcanvas,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,nullcanvas,\ + offapi \ + udkapi \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 5f1f2d760fb1..b031a0a534ad 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,simplecanvas,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,simplecanvas,\ + offapi \ + udkapi \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 9cc7405c3a8a..71415521f1d8 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,vclcanvas,\ $$(INCLUDE) \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/canvas/inc/pch \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,vclcanvas,\ + offapi \ + udkapi \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) |