summaryrefslogtreecommitdiff
path: root/scp2/util
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-26 20:58:59 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-26 20:58:59 +0000
commitff6fc8d3e4e6d8bd61d1f9ab0dd732b18fdd0b00 (patch)
treeb3dc50dd8339b1be21067296c389ea16d2401b6b /scp2/util
parent932709eca4773c530c8bada9762dbc1878a28296 (diff)
INTEGRATION: CWS sysint1 (1.8.2); FILE MERGED
2004/11/23 08:44:22 obr 1.8.2.4: fixed merge error 2004/11/18 10:15:34 obr 1.8.2.3: RESYNC: (1.8-1.9); FILE MERGED 2004/11/17 11:47:03 is 1.8.2.2: #118340# cleanup scp 2004/11/17 10:35:36 is 1.8.2.1: #118340# cleanup scp
Diffstat (limited to 'scp2/util')
-rw-r--r--scp2/util/makefile.mk27
1 files changed, 9 insertions, 18 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 4e189b940bb1..bc40f25305e7 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.12 $
+# $Revision: 1.13 $
#
-# last change: $Author: rt $ $Date: 2004-11-26 19:26:02 $
+# last change: $Author: hr $ $Date: 2004-11-26 21:58:59 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -80,7 +80,6 @@ SCP1LINK_PRODUCT_TYPE=osl
SCP1TARGET = setup_osl
SCP1FILES = installation_ooo.par \
scpaction_ooo.par \
- helptext_ooo.par \
directory_ooo.par \
datacarrier_ooo.par \
file_ooo.par \
@@ -89,12 +88,9 @@ SCP1FILES = installation_ooo.par \
file_library_ooo.par \
file_resource_ooo.par \
shortcut_ooo.par \
- custom_ooo.par \
- procedure_ooo.par \
module_ooo.par \
profile_ooo.par \
profileitem_ooo.par \
- starregistryitem_ooo.par \
module_writer.par \
file_writer.par \
module_calc.par \
@@ -114,23 +110,19 @@ SCP1FILES = installation_ooo.par \
file_lingu.par \
module_xsltfilter.par \
file_xsltfilter.par \
- starregistryitem_xsltfilter.par \
module_python.par \
file_python.par \
- procedure_python.par \
- starregistryitem_python.par \
profileitem_python.par
.IF "$(SOLAR_JAVA)"!=""
-SCP1FILES += \
- module_javafilter.par \
- file_javafilter.par \
- starregistryitem_javafilter.par
+SCP1FILES += \
+ module_javafilter.par \
+ file_javafilter.par
.ENDIF
.IF "$(SOLAR_JAVA)"!=""
.IF "$(GUI)"=="WNT"
-SCP1FILES += \
+SCP1FILES += \
registryitem_javafilter.par
.ENDIF
.ENDIF
@@ -155,10 +147,9 @@ SCP1FILES += \
SCP1FILES += \
module_activex.par \
file_activex.par \
- custom_activex.par \
- module_winexplorerext.par \
- file_winexplorerext.par \
- registryitem_winexplorerext.par
+ module_winexplorerext.par \
+ file_winexplorerext.par \
+ registryitem_winexplorerext.par
.ENDIF
.ENDIF