[Libreoffice-commits] .: extensions/source

Robert Nagy rnagy at kemper.freedesktop.org
Fri Nov 5 07:21:23 PDT 2010


 extensions/source/scanner/makefile.mk |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f3a9e0d65ad6e813ebc55b63dc8d32fbad0aa242
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)


More information about the Libreoffice-commits mailing list