diff options
| author | Andras Timar <atimar@suse.com> | 2012-01-06 18:56:40 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-01-06 19:16:33 +0100 |
| commit | 40d6a46770a82ffd78e676d0b1fe6eed9a1987da (patch) | |
| tree | f4199d8275f5345141ec3e7615e4f037c2f85125 /scp2/util | |
| parent | 66fd9a610cd876c236486a2089d8d58dca866e25 (diff) | |
remove support of the 'with JRE' installer
Diffstat (limited to 'scp2/util')
| -rw-r--r-- | scp2/util/makefile.mk | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 86831d588bf6..9af2c3a66a4c 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -222,40 +222,28 @@ SCP1FILES += \ .ENDIF # ------------------------------------------------------------------------ -# OpenOffice.org with JRE - -SCP2LINK_PRODUCT_TYPE=osl -SCP2TARGET = setup_osljre -SCP2FILES = $(SCP1FILES) \ - module_java.par - -.IF "$(GUI)"=="WNT" -SCP2FILES += file_jre_ooo.par -.ENDIF - -# ------------------------------------------------------------------------ # URE .IF "$(OS)" != "MACOSX" -SCP3LINK_PRODUCT_TYPE = osl -SCP3TARGET = ure -SCP3FILES = ure_standalone.par \ +SCP2LINK_PRODUCT_TYPE = osl +SCP2TARGET = ure +SCP2FILES = ure_standalone.par \ ure.par .ENDIF # ------------------------------------------------------------------------ # SDK -SCP4LINK_PRODUCT_TYPE = osl -SCP4TARGET = sdkoo -SCP4FILES = sdkoo.par +SCP3LINK_PRODUCT_TYPE = osl +SCP3TARGET = sdkoo +SCP3FILES = sdkoo.par # ------------------------------------------------------------------------ # Test -SCP5LINK_PRODUCT_TYPE = osl -SCP5TARGET = test -SCP5FILES = smoketest.par +SCP4LINK_PRODUCT_TYPE = osl +SCP4TARGET = test +SCP4FILES = smoketest.par # --- target ------------------------------------------------------------- .INCLUDE : target.mk |