[Libreoffice-commits] .: automation/source crashrep/source extensions/source

[Caolán McNamara]

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

New commits:
commit fee6519c1563cf2e108c9d6fc0dcb0d4023689a6
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Tue Feb 15 12:10:38 2011 +0000

    dragonfly stuff

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index a6fde25..5c10f77 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -459,6 +459,10 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
     abGP.Append( "25" );  // OpenBSD/i386
 #elif defined OPENBSD && defined X86_64
     abGP.Append( "26" );  // OpenBSD/amd64
+#elif defined DRAGONFLY && defined X86
+    abGP.Append( "27" );  // DragonFly/i386
+#elif defined DRAGONFLY && defined X86_64
+    abGP.Append( "28" );  // DragonFly/x86-64
 #else
 #error ("unknown platform. please request an ID for your platform on qa/dev")
 #endif
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk
index 8383f68..d0d04ff 100755
--- a/crashrep/source/unx/makefile.mk
+++ b/crashrep/source/unx/makefile.mk
@@ -56,7 +56,8 @@ APP1TARGET=$(TARGET)
 APP1OBJS=$(OBJFILES)
 APP1RPATH=BRAND
 
-.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD"
+.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD" && \
+    "$(OS)" != "DRAGONFLY"
 APP1STDLIBS+=-ldl -lnsl
 .ENDIF
 .IF "$(OS)" == "SOLARIS"
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index 0e9b5d4..f642a0d 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" || "$(OS)"=="OPENBSD"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
 APP1STDLIBS+= -lXt -lXext -lX11
 .ELIF "$(OS)"=="AIX"
 APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index baaefdf..99c1e43 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -77,7 +77,7 @@ SHL1STDLIBS=\
     $(SVTOOLLIB)
 
 .IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \
-	"$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD"
+    "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
 SHL1STDLIBS+=$(SVTOOLLIB) -ldl
 .ENDIF