diff options
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 68 |
1 files changed, 27 insertions, 41 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index f99795c8bfdf..a3c43edaaf67 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -720,7 +720,7 @@ CLASSDIR=$(OUT)$/class CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH) STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)$/bin$/jtools.jar com.sun.star.tool.starjar.StarJar -STARDEP=$(AUGMENT_LIBRARY_PATH) javadep +STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javadep .IF "$(PRJNAME)"=="sj2" CLASSPATH!:=$(CLASSPATH:s/sj2/no/) .ENDIF @@ -848,17 +848,6 @@ SOLARCOMMONPCKDIR=$(SOLARPCKDIR) SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .ENDIF -# local solver for building -.IF "$(BUILDSOLVER)"=="" -BUILDSOLARINCDIR=$(SOLARINCDIR) -BUILDSOLARBINDIR=$(SOLARBINDIR) -BUILDSOLARIDLDIR=$(SOLARIDLDIR) -.ELSE -BUILDSOLARINCDIR=$(BUILDSOLVER)$/$(UPD)$/$(INPATH)$/inc$(EXT_UPDMINOR) -BUILDSOLARBINDIR=$(BUILDSOLVER)$/$(UPD)$/$(INPATH)$/bin$(EXT_UPDMINOR) -BUILDSOLARIDLDIR=$(BUILDSOLVER)$/$(UPD)$/$(INPATH)$/idl$(EXT_UPDMINOR) -.ENDIF - .EXPORT : SOLARBINDIR .IF "$(PRE)"=="" @@ -913,9 +902,6 @@ UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER) UNOIDLINC!:=-I$(PRE)$/idl $(UNOIDLINC) .ENDIF UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR) -.IF "$(BUILDSOLARIDLDIR)"!="$(SOLARIDLDIR)" -UNOIDLINC+=-I$(BUILDSOLARIDLDIR) -.ENDIF CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME) @@ -979,9 +965,9 @@ MKDEPFLAGS+=$(MKDEPLOCAL) BISON=bison YACCFLAGS*=-d -SVIDL=$(AUGMENT_LIBRARY_PATH) svidl +SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/svidl -LDUMP2*=ldump4 +LDUMP2*=$(SOLARBINDIR)$/ldump4 ZIPUPDATE=-u -j ZIPFLAGS=$(ZIPUPDATE) @@ -995,9 +981,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION) .ENDIF # "$(SCPLINKVERSION)"!="" .IF "$(make_srs_deps)"!="" -RSC=$(AUGMENT_LIBRARY_PATH) rscdep +RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rscdep .ELSE # "$(make_srs_deps)"!="" -RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) rsc +RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)$/rsc .ENDIF # "$(make_srs_deps)"!="" #new @@ -1061,19 +1047,19 @@ MAXPROCESS!:=1 # allow seperate handling EXTMAXPROCESS*=$(MAXPROCESS) -IDLC*=$(AUGMENT_LIBRARY_PATH) idlc -REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge -REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare -REGCOMP*=$(AUGMENT_LIBRARY_PATH) regcomp -CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) cppumaker -JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) javamaker -RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker -CLIMAKER*=$(AUGMENT_LIBRARY_PATH) climaker +IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/idlc +REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regmerge +REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcompare +REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcomp +CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cppumaker +JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javamaker +RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rdbmaker +CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/climaker -TESTSHL2=$(AUGMENT_LIBRARY_PATH) testshl2 -HELPEX=$(AUGMENT_LIBRARY_PATH) helpex -LNGCONVEX=$(AUGMENT_LIBRARY_PATH) lngconvex -HELPLINKER=$(AUGMENT_LIBRARY_PATH) HelpLinker +TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/testshl2 +HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/helpex +LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/lngconvex +HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/HelpLinker .IF "$(JAVAINTERPRETER)" == "" JAVA*:=java @@ -1087,7 +1073,7 @@ JAVA*:=$(JAVAINTERPRETER) SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl LZIP*=lzip -CPPLCC*=$(AUGMENT_LIBRARY_PATH) cpplcc +CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpplcc .IF "$(DISABLE_ENHANCED_COMID)"=="" .INCLUDE : tg_compv.mk @@ -1338,47 +1324,47 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc .IF "$(COMP1TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk -$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP2TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk -$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP3TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk -$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP4TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk -$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP5TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk -$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP6TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk -$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP7TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk -$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP8TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk -$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP9TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk -$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF # some place to define these jars for SO environment |