[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - automation/source extensions/source

[Robert Nagy]

 automation/source/testtool/objtest.cxx        |    4 ++++
 extensions/source/nsplugin/source/makefile.mk |    2 +-
 extensions/source/plugin/unx/makefile.mk      |    2 +-
 extensions/source/scanner/makefile.mk         |    7 ++-----
 4 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 3edc480907b0d9f55156cdbe0917933f9e032fdb
Author: Robert Nagy <robert at openbsd.org>
Date:   Sat Nov 6 18:29:52 2010 +0100

    add OPENBSD ifdefs where needed

diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 4f9be74..1790851 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -49,7 +49,7 @@ dummy:
     @echo GTK disabled - nothing to build
 
 .ELSE           # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
 INC+= -DNP_LINUX
 .ENDIF
 PKGCONFIG_MODULES=gtk+-2.0
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index f3b7b48..0e9b5d4 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -77,7 +77,7 @@ APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
 .IF "$(DISABLE_XAW)" != "TRUE"
 APP1STDLIBS+=-lXaw 
 .ENDIF
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
 APP1STDLIBS+= -lXt -lXext -lX11
 .ELIF "$(OS)"=="AIX"
 APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl
commit b0c197cca1c93dee9ed9b7131c556c473efac249
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Sat Nov 6 00:23:00 2010 +0100

    Improve f3d4826fe53173d0f50d53b11cd2b4402b2a286d: avoid duplicate numbers.

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 29dc7a2..df6f227 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -506,9 +506,9 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
 #elif defined NETBSD && defined X86_64
     abGP.Append( "24" );  // NetBSD/amd64
 #elif defined OPENBSD && defined X86
-    abGP.Append( "24" );  // OpenBSD/i386
+    abGP.Append( "25" );  // OpenBSD/i386
 #elif defined OPENBSD && defined X86_64
-    abGP.Append( "25" );  // OpenBSD/amd64
+    abGP.Append( "26" );  // OpenBSD/amd64
 #else
 #error ("unknown platform. please request an ID for your platform on qa/dev")
 #endif
commit dfd0c5d162adfc92ff4951cef50821e36ec1b693
Author: Robert Nagy <robert at openbsd.org>
Date:   Fri Nov 5 15:19:40 2010 +0100

    Do not use -ldl on OpenBSD and tidy up the .IF block a bit

diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index 26ed6e7..baaefdf 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -76,13 +76,10 @@ SHL1STDLIBS=\
     $(VCLLIB)			\
     $(SVTOOLLIB)
 
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="FREEBSD"
-.IF "$(OS)"!="NETBSD"
+.IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \
+	"$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD"
 SHL1STDLIBS+=$(SVTOOLLIB) -ldl
 .ENDIF
-.ENDIF
-.ENDIF
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB=i$(TARGET)
commit 065da7e6ed5ca943613d3ab3dfcebb4cf3188cbe
Author: Robert Nagy <robert at openbsd.org>
Date:   Fri Nov 5 11:16:45 2010 +0100

    add OpenBSD platforms

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 7477f53..29dc7a2 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -505,6 +505,10 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
     abGP.Append( "23" );  // Linux ALPHA
 #elif defined NETBSD && defined X86_64
     abGP.Append( "24" );  // NetBSD/amd64
+#elif defined OPENBSD && defined X86
+    abGP.Append( "24" );  // OpenBSD/i386
+#elif defined OPENBSD && defined X86_64
+    abGP.Append( "25" );  // OpenBSD/amd64
 #else
 #error ("unknown platform. please request an ID for your platform on qa/dev")
 #endif