diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-19 16:07:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-19 16:07:16 +0000 |
| commit | cc310a300d59fa69feb365d968e9918cee2e700d (patch) | |
| tree | 91a403f3696d7775258224d0a6ac86b1d4d833ce /solenv/inc/unx.mk | |
| parent | d61441831e88104eb6f047e303ef39352d3c2e4a (diff) | |
INTEGRATION: CWS kaddrbook (1.27.286); FILE MERGED
2005/11/29 22:06:42 kendy 1.27.286.4: RESYNC: (1.27-1.30); FILE MERGED
2005/08/31 16:01:01 ebischoff 1.27.286.3: #54014# It was breaking OOo builds
2005/08/31 12:42:28 ebischoff 1.27.286.2: Moving KDE stuff inside of "$(GUI)" == "UNX" test
2005/08/31 12:22:16 fs 1.27.286.1: #i54014#
Diffstat (limited to 'solenv/inc/unx.mk')
| -rw-r--r-- | solenv/inc/unx.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 4f6b47949deb..9167e6b03a8b 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -4,9 +4,9 @@ # # $RCSfile: unx.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: kz $ $Date: 2005-11-07 12:43:30 $ +# last change: $Author: obo $ $Date: 2005-12-19 17:07:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -198,3 +198,11 @@ SONAME_SWITCH*=-h DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR) .ENDIF # "$(UNIXVERSIONNAMES)"!="" +# enable building/linking KDE-dependent code in both OOo and SO build environment +.IF "$(ENABLE_KDE)" != "" +.IF "$(KDE_ROOT)"!="" +KDE_CFLAGS:=-I$(KDE_ROOT)$/include -DQT_CLEAN_NAMESPACE +KDE_LIBS:=-lkdeui -lkdecore -lqt-mt +SOLARLIB+=-L$(KDE_ROOT)$/lib +.ENDIF # "$(KDE_ROOT)"!="" +.ENDIF # "$(ENABLE_KDE)" != "" |