INTEGRATION: CWS vcl90 (1.109.48); FILE MERGED

2008/06/24 09:01:05 pl 1.109.48.1: #i90809# Xrandr link modifications (thanks thb)
This commit is contained in:
Vladimir Glazounov
2008-07-02 09:15:58 +00:00
parent 4b082170b7
commit 7f06beee3c

View File

@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.109 $
# $Revision: 1.110 $
#
# This file is part of OpenOffice.org.
#
@@ -307,6 +307,12 @@ SHL2STDLIBS += -lXext -lSM -lICE -lX11
SHL2STDLIBS+= -ldl
.ENDIF
.IF "$(ENABLE_RANDR)" != ""
.IF "$(XRANDR_DLOPEN)" == "FALSE"
SHL2STDLIBS+= $(XRANDR_LIBS)
.ENDIF
.ENDIF
.ENDIF # "$(GUIBASE)"=="unx"
# gtk plugin
@@ -351,6 +357,12 @@ SHL4STDLIBS+=\
$(VOSLIB) \
$(SALLIB)
.IF "$(ENABLE_RANDR)" != ""
.IF "$(XRANDR_DLOPEN)" == "FALSE"
SHL4STDLIBS+= $(XRANDR_LIBS)
.ENDIF
.ENDIF
.ENDIF # "$(ENABLE_GTK)" != ""
# KDE plugin
@@ -373,6 +385,13 @@ SHL5STDLIBS+=\
$(TOOLSLIB) \
$(VOSLIB) \
$(SALLIB)
.IF "$(ENABLE_RANDR)" != ""
.IF "$(XRANDR_DLOPEN)" == "FALSE"
SHL5STDLIBS+= $(XRANDR_LIBS)
.ENDIF
.ENDIF
.ENDIF # "$(ENABLE_KDE)" != ""
.ENDIF # UNX