[Libreoffice-commits] .: autodoc/source odk/source odk/util

[Caolán McNamara]

 autodoc/source/mkinc/fullcpp.mk         |    3 ++-
 odk/source/unoapploader/unx/makefile.mk |    2 +-
 odk/util/makefile.pmk                   |    6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 40f8afbc768502da95d65f31f47237a25ef665a1
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Tue Feb 15 12:12:28 2011 +0000

    dragonfly stuff

diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
index 75b2516..c7519d8 100644
--- a/autodoc/source/mkinc/fullcpp.mk
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -35,7 +35,8 @@
 .IF "$(GUI)"=="WNT"
 CFLAGS+= -GR
 .ENDIF
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || $(COM) == "GCC"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
+    "$(OS)"=="DRAGONFLY" || $(COM) == "GCC"
 CFLAGSCXX+= -frtti
 .ENDIF
 
diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk
index 7a93bce..4ba98b1 100644
--- a/odk/source/unoapploader/unx/makefile.mk
+++ b/odk/source/unoapploader/unx/makefile.mk
@@ -43,7 +43,7 @@ LIBSALCPPRT=
 LINK=$(CC)
 .ENDIF
 
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="DRAGONFLY"
 STDLIB= -ldl
 .ENDIF
 
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 782f1e6..db4a85f 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -66,7 +66,8 @@ LIBOUT=$(SOLARLIBDIR)
 
 MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
 
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || \
+    "$(OS)"=="AIX" || "$(OS)"=="DRAGONFLY"
 MY_COPY=$(GNUCOPY)
 MY_COPY_RECURSIVE=$(GNUCOPY) -r
 .ELSE
@@ -133,6 +134,9 @@ DESTPLATFROM=netbsd
 # FREEBSD
 DESTPLATFROM=freebsd
 
+.ELIF "$(OS)"=="DRAGONFLY"
+DESTPLATFROM=dragonfly
+
 .ELIF "$(OS)"=="MACOSX"
 # MACOSX
 DESTPLATFROM=macosx