diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 16:33:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 16:33:48 +0000 |
| commit | 6dc0394a550a6aee1cad37a12269f3fb40f240bc (patch) | |
| tree | 26ad3f6db96b03e1f4a09fac2d902c254455ee7d /solenv/inc/target.mk | |
| parent | 50dc9bd18b3220f9d225b8f0331aa7b10c084346 (diff) | |
INTEGRATION: CWS ause081 (1.196.60); FILE MERGED
2007/06/22 12:45:37 hjs 1.196.60.1: #i78393# remove generation of description object file
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 2fbc9043992c..24e84a1146d1 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -4,9 +4,9 @@ # # $RCSfile: target.mk,v $ # -# $Revision: 1.196 $ +# $Revision: 1.197 $ # -# last change: $Author: ihi $ $Date: 2007-04-16 13:45:43 $ +# last change: $Author: hr $ $Date: 2007-06-26 17:33:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -660,19 +660,6 @@ SHL9BASEX=/BASE:$(SHL9BASE) .ENDIF .ENDIF -# disable all descriptions -.IF "$(NO_SHL_DESCRIPTION)"!="" -NO_SHL1DESCRIPTION=TRUE -NO_SHL2DESCRIPTION=TRUE -NO_SHL3DESCRIPTION=TRUE -NO_SHL4DESCRIPTION=TRUE -NO_SHL5DESCRIPTION=TRUE -NO_SHL6DESCRIPTION=TRUE -NO_SHL7DESCRIPTION=TRUE -NO_SHL8DESCRIPTION=TRUE -NO_SHL9DESCRIPTION=TRUE -.ENDIF # "$(NO_SHLDESCRIPTION)"!="" - .IF "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" .IF "$(UNOUCRRDB)"!="" COMPRDB*:=$(UNOUCRRDB) @@ -682,81 +669,54 @@ COMPRDB*:=$(SOLARBINDIR)$/types.rdb .ENDIF # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" .IF "$(COMP1TYPELIST)"!="" UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL1DESCRIPTION)"=="" -SHL1DESCRIPTIONOBJ*=$(SLO)$/$(COMP1TYPELIST)_description.obj -.ENDIF # "$(NO_SHL1DESCRIPTION)"=="" COMP1RDBTARGETN:=$(BIN)$/$(COMP1TYPELIST).rdb #COMP1TYPELISTN:=$(MISC)$/$(COMP1TYPELIST).xml .ENDIF .IF "$(COMP2TYPELIST)"!="" UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL2DESCRIPTION)"=="" -SHL2DESCRIPTIONOBJ*=$(SLO)$/$(COMP2TYPELIST)_description.obj -.ENDIF # "$(NO_SHL2DESCRIPTION)"=="" COMP2RDBTARGETN:=$(BIN)$/$(COMP2TYPELIST).rdb #COMP2TYPELISTN:=$(MISC)$/$(COMP2TYPELIST).xml .ENDIF .IF "$(COMP3TYPELIST)"!="" UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL3DESCRIPTION)"=="" -SHL3DESCRIPTIONOBJ*=$(SLO)$/$(COMP3TYPELIST)_description.obj -.ENDIF # "$(NO_SHL3DESCRIPTION)"=="" COMP3RDBTARGETN:=$(BIN)$/$(COMP3TYPELIST).rdb #COMP3TYPELISTN:=$(MISC)$/$(COMP3TYPELIST).xml .ENDIF .IF "$(COMP4TYPELIST)"!="" UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL4DESCRIPTION)"=="" -SHL4DESCRIPTIONOBJ*=$(SLO)$/$(COMP4TYPELIST)_description.obj -.ENDIF # "$(NO_SHL4DESCRIPTION)"=="" COMP4RDBTARGETN:=$(BIN)$/$(COMP4TYPELIST).rdb #COMP4TYPELISTN:=$(MISC)$/$(COMP4TYPELIST).xml .ENDIF .IF "$(COMP5TYPELIST)"!="" UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL5DESCRIPTION)"=="" -SHL5DESCRIPTIONOBJ*=$(SLO)$/$(COMP5TYPELIST)_description.obj -.ENDIF # "$(NO_SHL5DESCRIPTION)"=="" COMP5RDBTARGETN:=$(BIN)$/$(COMP5TYPELIST).rdb #COMP5TYPELISTN:=$(MISC)$/$(COMP5TYPELIST).xml .ENDIF .IF "$(COMP6TYPELIST)"!="" UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL6DESCRIPTION)"=="" -SHL6DESCRIPTIONOBJ*=$(SLO)$/$(COMP6TYPELIST)_description.obj -.ENDIF # "$(NO_SHL6DESCRIPTION)"=="" COMP6RDBTARGETN:=$(BIN)$/$(COMP6TYPELIST).rdb #COMP6TYPELISTN:=$(MISC)$/$(COMP6TYPELIST).xml .ENDIF .IF "$(COMP7TYPELIST)"!="" UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL7DESCRIPTION)"=="" -SHL7DESCRIPTIONOBJ*=$(SLO)$/$(COMP7TYPELIST)_description.obj -.ENDIF # "$(NO_SHL7DESCRIPTION)"=="" COMP7RDBTARGETN:=$(BIN)$/$(COMP7TYPELIST).rdb #COMP7TYPELISTN:=$(MISC)$/$(COMP7TYPELIST).xml .ENDIF .IF "$(COMP8TYPELIST)"!="" UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL8DESCRIPTION)"=="" -SHL8DESCRIPTIONOBJ*=$(SLO)$/$(COMP8TYPELIST)_description.obj -.ENDIF # "$(NO_SHL8DESCRIPTION)"=="" COMP8RDBTARGETN:=$(BIN)$/$(COMP8TYPELIST).rdb #COMP8TYPELISTN:=$(MISC)$/$(COMP8TYPELIST).xml .ENDIF .IF "$(COMP9TYPELIST)"!="" UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES) -.IF "$(NO_SHL9DESCRIPTION)"=="" -SHL9DESCRIPTIONOBJ*=$(SLO)$/$(COMP9TYPELIST)_description.obj -.ENDIF # "$(NO_SHL9DESCRIPTION)"=="" COMP9RDBTARGETN:=$(BIN)$/$(COMP9TYPELIST).rdb #COMP9TYPELISTN:=$(MISC)$/$(COMP9TYPELIST).xml .ENDIF |