summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-11-09 08:40:13 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-11-09 08:40:13 +0000
commit064c5cf21da2098b2268d9082b0044d6e35bb669 (patch)
treeac6daa8634878553d5360d755227e68279a94b41
parentf6191e1f875a58ade22e069bb8eeaedf4cdc8953 (diff)
INTEGRATION: CWS sdkinstaller (1.23.112); FILE MERGED
2005/10/28 13:22:03 is 1.23.112.3: #i56859# java product for all platforms 2005/10/14 13:40:30 jsc 1.23.112.2: RESYNC: (1.23-1.24); FILE MERGED 2005/09/08 10:22:56 is 1.23.112.1: #120096# new sdkoo product
-rw-r--r--scp2/util/makefile.mk18
1 files changed, 12 insertions, 6 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 31c7f2957fcc..13f09741dcfd 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.24 $
+# $Revision: 1.25 $
#
-# last change: $Author: rt $ $Date: 2005-09-09 01:52:09 $
+# last change: $Author: rt $ $Date: 2005-11-09 09:40:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -150,9 +150,7 @@ SCP1FILES += \
vclcanvas.par
# ------------------------------------------------------------------------
-# OpenOffice.org with JRE (Windows Only)
-
-.IF "$(GUI)"=="WNT"
+# OpenOffice.org with JRE
SCP2LINK_PRODUCT_TYPE=osl
SCP2TARGET = setup_osljre
@@ -257,12 +255,20 @@ SCP2FILES += \
SCP2FILES += \
vclcanvas.par
-.ENDIF
+# ------------------------------------------------------------------------
+# URE
SCP3LINK_PRODUCT_TYPE = ure
SCP3TARGET = ure
SCP3FILES = ure.par
+# ------------------------------------------------------------------------
+# SDK
+
+SCP4LINK_PRODUCT_TYPE = sdk
+SCP4TARGET = sdkoo
+SCP4FILES = sdkoo.par
+
# --- target -------------------------------------------------------------
.INCLUDE : target.mk