[Libreoffice-commits] .: padmin/Library_spa.mk toolkit/Library_tk.mk

[Robert Nagy]

 padmin/Library_spa.mk |    9 +++++++--
 toolkit/Library_tk.mk |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit d9b0c576358d982f5f9160ae481b0d9e4b64c1d1
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Apr 5 11:59:42 2011 +0200

    link to the correct libraries on *BSD too

diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index 6827729..82b3e4e 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -62,12 +62,17 @@ $(eval $(call gb_Library_add_exception_objects,spa,\
     padmin/source/titlectrl \
 ))
 
-ifeq ($(OS),LINUX)
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 $(eval $(call gb_Library_add_linked_libs,spa,\
-    dl \
     m \
     pthread \
 ))
 endif
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,spa,\
+    dl \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 15c8692..1a94bbd 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -163,7 +163,7 @@ $(eval $(call gb_Library_set_cxxflags,tk,\
     $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
 endif
 
-ifeq ($(OS),LINUX)
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 $(eval $(call gb_Library_add_linked_libs,tk,\
     X11 \
 ))