diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:14 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:14 +0200 |
| commit | 75068ecaa17c9724feb06f9b8ee12ac29012beda (patch) | |
| tree | 63ca4dfc3d33f814c4ad27718c0756762b54e2d7 /canvas | |
| parent | 941020379b1ea1ec7c564c21e68ea1674cda7683 (diff) | |
gnumake4: fix buildbreakers from merge
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_canvasfactory.mk | 3 | ||||
| -rw-r--r-- | canvas/Library_canvastools.mk | 9 | ||||
| -rw-r--r-- | canvas/Library_nullcanvas.mk | 9 | ||||
| -rw-r--r-- | canvas/Library_simplecanvas.mk | 9 | ||||
| -rw-r--r-- | canvas/Library_vclcanvas.mk | 15 |
5 files changed, 20 insertions, 25 deletions
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 8078e48e8a5b..ce02c19bee28 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -37,10 +37,9 @@ $(eval $(call gb_Library_set_include,canvasfactory,\ )) $(eval $(call gb_Library_add_linked_libs,canvasfactory,\ - sal \ - stl \ cppu \ cppuhelper \ + sal \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 32f6ff5037f4..dc424edde0e0 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -55,15 +55,14 @@ $(eval $(call gb_Library_add_defs,canvastools,\ endif $(eval $(call gb_Library_add_linked_libs,canvastools,\ - sal \ - stl \ - cppu \ basegfx \ - cppuhelper \ comphelper \ - vcl \ + cppu \ + cppuhelper \ + sal \ tk \ tl \ + vcl \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index ecd7b862b101..e17980422bff 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -41,13 +41,12 @@ $(eval $(call gb_Library_add_defs,nullcanvas,\ endif $(eval $(call gb_Library_add_linked_libs,nullcanvas,\ - cppu \ - sal \ - comphelper \ - cppuhelper \ - stl \ basegfx \ canvastools \ + comphelper \ + cppu \ + cppuhelper \ + sal \ vcl \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 831177f05f9e..5f1f2d760fb1 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -43,13 +43,12 @@ $(eval $(call gb_Library_add_defs,simplecanvas,\ endif $(eval $(call gb_Library_add_linked_libs,simplecanvas,\ - sal \ - stl \ - cppu \ basegfx \ - cppuhelper \ - comphelper \ canvastools \ + comphelper \ + cppu \ + cppuhelper \ + sal \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 5d5cf7825a02..9cc7405c3a8a 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -43,18 +43,17 @@ $(eval $(call gb_Library_add_defs,vclcanvas,\ endif $(eval $(call gb_Library_add_linked_libs,vclcanvas,\ - sal \ - stl \ - cppu \ basegfx \ - cppuhelper \ + canvastools \ comphelper \ - vcl \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + svt \ tk \ tl \ - svt \ - i18nisolang1 \ - canvastools \ + vcl \ $(gb_STDLIBS) \ )) |