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 /basegfx | |
| parent | Merge branch 'master' into feature/gnumake4 (diff) | |
| download | core-75068ecaa17c9724feb06f9b8ee12ac29012beda.tar.gz core-75068ecaa17c9724feb06f9b8ee12ac29012beda.zip | |
gnumake4: fix buildbreakers from merge
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/CppunitTest_basegfx.mk | 5 | ||||
| -rw-r--r-- | basegfx/Library_basegfx.mk | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index d8eeff5fe21e..51cdcc699ae0 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -40,11 +40,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \ basegfx \ - sal \ - stl \ + cppu \ cppuhelper \ cppunit \ - cppu \ + sal \ $(gb_STDLIBS) \ )) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 7fc527f3f103..c510b5f52571 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -44,10 +44,9 @@ $(eval $(call gb_Library_add_defs,basegfx,\ )) $(eval $(call gb_Library_add_linked_libs,basegfx,\ - sal \ - stl \ cppu \ cppuhelper \ + sal \ $(gb_STDLIBS) \ )) |