summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-02-17 17:41:33 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-02-17 18:09:55 +0200
commit33b6af02195144875e9fa1a0663d55441aa3f5f4 (patch)
treea86150bb59ce0f42b4cdf8bc9fa497097c7ee03f
parent18f4ff23179620e834aa3ebd83a2e15c2f77cbe1 (diff)
We want gb_STDLIBS here surely?
-rw-r--r--jvmaccess/Library_jvmaccess.mk7
-rw-r--r--jvmfwk/Library_jvmfwk.mk1
-rw-r--r--jvmfwk/Library_sunjavaplugin.mk1
-rw-r--r--unotest/Library_unoexceptionprotector.mk1
-rw-r--r--unotest/Library_unotest.mk1
5 files changed, 5 insertions, 6 deletions
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 98bfb46a93c4..c7bddf2860aa 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -45,14 +45,9 @@ $(eval $(call gb_Library_add_linked_libs,jvmaccess,\
cppu \
sal \
salhelper \
+ $(gb_STDLIBS) \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,jvmaccess,\
- advapi32 \
-))
-endif
-
$(eval $(call gb_Library_add_exception_objects,jvmaccess,\
jvmaccess/source/classpath \
jvmaccess/source/unovirtualmachine \
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index e58dade8b138..5b424d0aa58c 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_api,jvmfwk,\
$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
cppuhelper \
sal \
+ $(gb_STDLIBS) \
))
ifeq ($(OS),WNT)
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 734e5647655f..d1d2af4fe649 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
cppuhelper \
sal \
salhelper \
+ $(gb_STDLIBS) \
))
ifeq ($(OS),ANDROID)
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
index 079574b9144c..3324f3e416ce 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\
cppu \
cppuhelper \
sal \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,unoexceptionprotector,\
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index 9cfd3719e58f..aad6abdbceec 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,unotest,\
cppu \
cppuhelper \
sal \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,unotest,\