diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-07 11:43:19 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-07 11:43:19 +0000 |
| commit | c525e9b88a37d3fed0254a58463fafb7d01ae280 (patch) | |
| tree | acdb69aea820de206508f0b99e6bdd759a19d9ef /solenv/inc/settings.mk | |
| parent | 90bac82fb7f80dc109ae3272948be2e3e2a31d27 (diff) | |
INTEGRATION: CWS vq23 (1.176.72); FILE MERGED
2005/11/04 15:54:17 vq 1.176.72.2: #i56984# Remove more obsolete macros and consolidate a little more.
2005/10/30 20:10:39 vq 1.176.72.1: #i56984# Remove check for inclusion of as4.mk.
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 97509931525d..3f90ffd3e74d 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.176 $ +# $Revision: 1.177 $ # -# last change: $Author: rt $ $Date: 2005-09-08 09:40:34 $ +# last change: $Author: kz $ $Date: 2005-11-07 12:43:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -1119,10 +1119,6 @@ SVXLIBS=svxitems dialogs editeng svrtf svdraw outliner xout si basicide \ .INCLUDE : wnt.mk .ENDIF -.IF "$(GUI)" == "AS4" -.INCLUDE : as4.mk -.ENDIF - .IF "$(GUI)" == "UNX" .INCLUDE : unx.mk .ENDIF @@ -1131,29 +1127,21 @@ SVXLIBS=svxitems dialogs editeng svrtf svdraw outliner xout si basicide \ # allow seperate handling EXTMAXPROCESS*=$(MAXPROCESS) -IDLC*=idlc -REGMERGE*=regmerge -REGCOMPARE*=regcompare -REGCOMP*=regcomp -CPPUMAKER*=cppumaker -JAVAMAKER*=javamaker -.IF "$(GUI)" == "WNT" -CLIMAKER*=climaker -CSC*=csc -VBC*=vbc -.ENDIF - -RDBMAKER*=rdbmaker +IDLC*=$(WRAPCMD) idlc +REGMERGE*=$(WRAPCMD) regmerge +REGCOMPARE*=$(WRAPCMD) regcompare +REGCOMP*=$(WRAPCMD) regcomp +CPPUMAKER*=$(WRAPCMD) cppumaker +JAVAMAKER*=$(WRAPCMD) javamaker +RDBMAKER*=$(WRAPCMD) rdbmaker .IF "$(JAVAINTERPRETER)" == "" JAVA*=java .ELSE JAVA*=$(JAVAINTERPRETER) .ENDIF -SCPCOMP*=scpcomp -#SCPLINK*=scplink -SCPLINK*=$(PERL) $(SOLARENV)$/bin/par2script.pl +SCPLINK=$(WRAPCMD) $(PERL) $(SOLARENV)$/bin/par2script.pl LZIP*=lzip -CPPLCC*=cpplcc +CPPLCC*=$(WRAPCMD) cpplcc .IF "$(DISABLE_ENHANCED_COMID)"=="" .INCLUDE : tg_compv.mk |