[Libreoffice-commits] .: cppunit/makefile.mk cppunit/prj

[Robert Nagy]

 cppunit/makefile.mk |    4 +++-
 cppunit/prj/d.lst   |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 11c3398a91d7f65a45e08ad4ee33bdb5a7355111
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 09:27:13 2010 +0100

    add the correct cppunit library name for OpenBSD

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 50d4893..26e6845 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -142,7 +142,7 @@ OOO_STLPORT_LIBS += -lstdc++
 # execute that program; however, the program would fail to locate the STLport
 # library (another work-around might be to add something like --as-needed around
 # $(LIBSTLPORT)):
-.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
+.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "OPENBSD"
 .IF "$(LD_LIBRARY_PATH)" == ""
 LD_LIBRARY_PATH := $(SOLARLIBDIR)
     # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
@@ -183,6 +183,8 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
 EXTRPATH = NONE
 .ELIF "$(OS)" == "AIX"
 OUT2LIB = ooo-install/lib/libcppunit-1.12.a
+.ELIF "$(OS)" == "OPENBSD"
+OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0
 .ELSE
 OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
 .END
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index e881e4a..3e30ad2 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -24,6 +24,9 @@ symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.
 ..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1
 symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so
 
+..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0
+symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit.so
+
 ..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a
 symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a