diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:41:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:41:43 +0000 |
| commit | ac99b4b4ed1cc7e483fd9bd91e7e4cee7c867b2e (patch) | |
| tree | 70a1df7eefa738087c2b13dbf76b49db4e14cd3f /scp2/util | |
| parent | 83248c9c64bee9a153957e3fd749fdfe78fef2c3 (diff) | |
INTEGRATION: CWS sb83 (1.42.22); FILE MERGED
2008/03/17 09:02:01 sb 1.42.22.8: RESYNC: (1.43-1.44); FILE MERGED
2008/02/14 11:05:31 is 1.42.22.7: '#i86068#_readmes_into_brand_language_pack'
2008/02/06 14:06:50 sb 1.42.22.6: #i84200# moved image sets to brand layer
2008/01/30 12:02:25 sb 1.42.22.5: #i84200# changes for MACOSX; additions to SCP1FILES missing from SCP2FILES
2008/01/30 09:39:44 sb 1.42.22.4: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:28 sb 1.42.22.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:32 sb 1.42.22.2: RESYNC: (1.42-1.43); FILE MERGED
2007/12/10 14:49:25 sb 1.42.22.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
Diffstat (limited to 'scp2/util')
| -rw-r--r-- | scp2/util/makefile.mk | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 4ba48d9b5839..8421aa45d6bf 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.44 $ +# $Revision: 1.45 $ # -# last change: $Author: kz $ $Date: 2008-03-06 12:47:26 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:41:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,6 @@ SCP1FILES = installation_ooo.par \ directory_ooo.par \ datacarrier_ooo.par \ file_ooo.par \ - file_images_ooo.par \ file_extra_ooo.par \ file_font_ooo.par \ file_library_ooo.par \ @@ -91,7 +90,12 @@ SCP1FILES = installation_ooo.par \ module_python_mailmerge.par \ file_python.par \ profileitem_python.par \ - shortcut_python.par + shortcut_python.par \ + ure_into_ooo.par \ + ure.par \ + common_brand.par \ + common_brand_readme.par \ + ooo_brand.par .IF "$(SOLAR_JAVA)"!="" SCP1FILES += \ @@ -196,7 +200,6 @@ SCP2FILES = installation_ooo.par \ directory_ooo.par \ datacarrier_ooo.par \ file_ooo.par \ - file_images_ooo.par \ file_extra_ooo.par \ file_font_ooo.par \ file_library_ooo.par \ @@ -233,7 +236,13 @@ SCP2FILES = installation_ooo.par \ module_python.par \ module_python_mailmerge.par \ file_python.par \ - profileitem_python.par + profileitem_python.par \ + shortcut_python.par \ + ure_into_ooo.par \ + ure.par \ + common_brand.par \ + common_brand_readme.par \ + ooo_brand.par .IF "$(SOLAR_JAVA)"!="" SCP2FILES += \ @@ -324,9 +333,12 @@ SCP2FILES += aqua_ooo.par # ------------------------------------------------------------------------ # URE -SCP3LINK_PRODUCT_TYPE = ure +.IF "$(OS)" != "MACOSX" +SCP3LINK_PRODUCT_TYPE = osl SCP3TARGET = ure -SCP3FILES = ure.par +SCP3FILES = ure_standalone.par \ + ure.par +.ENDIF # ------------------------------------------------------------------------ # SDK @@ -335,13 +347,6 @@ SCP4LINK_PRODUCT_TYPE = sdk SCP4TARGET = sdkoo SCP4FILES = sdkoo.par -# ------------------------------------------------------------------------ -# OOo w/o URE - -SCP5LINK_PRODUCT_TYPE = osl -SCP5TARGET = ooo_wo_ure -SCP5FILES = $(SCP1FILES) ooo_wo_ure.par - # --- target ------------------------------------------------------------- .INCLUDE : target.mk |