diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-11 02:05:22 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-11 02:57:57 +0200 |
| commit | 0acf93fc20f784cdd415872d61b9b7fe1c95ca00 (patch) | |
| tree | 9f497a359188156b8857dc19c316cb1d16a08101 | |
| parent | 481d0d647334f91701dfc63bcb9b68c0a53c1865 (diff) | |
I don't see SO3 being used anywhere
| -rwxr-xr-x | set_soenv.in | 4 | ||||
| -rw-r--r-- | solenv/inc/startup/startup.mk | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/set_soenv.in b/set_soenv.in index 364ca13a528a..41af1fbff897 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -46,7 +46,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment, # # Platform independent constant values. my ( $CALL_CDECL, $COMMON_OUTDIR, - $common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA, + $common_build, $NO_REC_RES, $SOLAR_JAVA, $SOLAR_PLUGIN, $UPDATER, $VCL, $CC, $CXX, $NO_BSYMBOLIC); @@ -170,7 +170,6 @@ $CALL_CDECL = "TRUE"; $COMMON_OUTDIR = ""; $common_build = ""; $NO_REC_RES = "TRUE"; -$SO3 = "TRUE"; $SOLAR_JAVA = "@SOLAR_JAVA@"; $SOLAR_PLUGIN = "TRUE"; $UPDATER = "YES"; @@ -1443,7 +1442,6 @@ ToFile( "CALL_CDECL", $CALL_CDECL, "e" ); ToFile( "COMMON_OUTDIR", $COMMON_OUTDIR, "e" ); ToFile( "common_build", $common_build, "e" ); ToFile( "NO_REC_RES", $NO_REC_RES, "e" ); -ToFile( "SO3", $SO3, "e" ); ToFile( "SOLAR_PLUGIN", $SOLAR_PLUGIN, "e" ); ToFile( "UPDATER", $UPDATER, "e" ); ToFile( "VCL", $VCL, "e" ); diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index da4f38e5e5ad..e3e415e23181 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS) .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc # Grab key definitions from the environment -# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS +# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL ENVCFLAGS .IF "$(OS)" == "" || "$(OS)" == "Windows_NT" .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build! |