summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-18 14:19:15 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-18 14:19:15 +0000
commit82d43c2e0d8b9afa441452d4b527766aaafa06fe (patch)
tree58072e9a2c5368045afd69ed99c96704fcd4bfcc
parenta2e5fffb98a40d49e321ee0d307bbbe5e4ef9577 (diff)
INTEGRATION: CWS pj16 (1.8.10); FILE MERGED
2005/01/09 16:54:31 pjanik 1.8.10.1: #i40179#: FreeBSD also need to define NP_LINUX, doesn't have -ldl. From NAKATA Maho.
-rw-r--r--extensions/source/nsplugin/source/makefile.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 3bb69e7d38df..346fe1d67842 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: rt $ $Date: 2005-01-03 09:04:51 $
+# last change: $Author: kz $ $Date: 2005-01-18 15:19:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -78,7 +78,7 @@ dummy:
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -99,8 +99,10 @@ SHL1OBJS= $(SLO)$/npshell.obj \
.IF "$(GUI)"=="UNX"
SHL1OBJS+=$(SLO)$/npunix.obj
SLOFILES+=$(SLO)$/npunix.obj
+.IF "$(OS)"!="FREEBSD"
SHL1STDLIBS+= -ldl -lnsl
-.ENDIF
+.ENDIF #FREEBSD
+.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SLO)$/npwin.obj
SLOFILES+=$(SLO)$/npwin.obj
@@ -131,7 +133,7 @@ APP1STDLIBS=\
.IF "$(GUI)"=="UNX"
APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF