diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:44:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:44:55 +0000 |
| commit | 42e10cbd6515fe97925c54a2909faeba6209775c (patch) | |
| tree | 692cf8cc6fa225ef82a14d7ab1fc21b4a1bfe8a7 | |
| parent | b341641638ca95fd485c9099a2bc81d101efb586 (diff) | |
INTEGRATION: CWS execshellmacrogone (1.218.10); FILE MERGED
2007/10/24 08:34:27 rene 1.218.10.2: RESYNC: (1.218-1.220); FILE MERGED
2007/10/24 06:35:45 rene 1.218.10.1: #i79760# krs patches for supressing "Executing shell macro..." output
| -rw-r--r-- | solenv/inc/settings.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 4c9d8bfe2a3c..bad790bbb6e0 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.220 $ +# $Revision: 1.221 $ # -# last change: $Author: vg $ $Date: 2007-10-15 12:39:26 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:44:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -1247,47 +1247,47 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc .IF "$(COMP1TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk -$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP2TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk -$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP3TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk -$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP4TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk -$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP5TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk -$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP6TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk -$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP7TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk -$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP8TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk -$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP9TYPELIST)"!="" .INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk -$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF # some place to define these jars for SO environment |