INTEGRATION: CWS ooo20040704 (1.1.12); FILE MERGED

2004/08/16 13:27:04 vg 1.1.12.2: fix for merge conflict
2004/06/28 14:46:08 cmc 1.1.12.1: #i30801# allow using system libs if possible

1 files changed, 110 insertions, 105 deletions

diff --git a/unoxml/source/dom/makefile.mk b/unoxml/source/dom/makefile.mk
index 5d568c32210a..a3703c4a767d 100644
--- a/unoxml/source/dom/makefile.mk
+++ b/unoxml/source/dom/makefile.mk
@@ -1,105 +1,110 @@
-#*************************************************************************

-#

-#   $RCSfile: makefile.mk,v $

-#

-#   $Revision: 1.1 $

-#

-#   last change: $Author: lo $ $Date: 2004-01-28 16:31:35 $

-#

-#   The Contents of this file are made available subject to the terms of

-#   either of the following licenses

-#

-#          - GNU Lesser General Public License Version 2.1

-#          - Sun Industry Standards Source License Version 1.1

-#

-#   Sun Microsystems Inc., October, 2000

-#

-#   GNU Lesser General Public License Version 2.1

-#   =============================================

-#   Copyright 2000 by Sun Microsystems, Inc.

-#   901 San Antonio Road, Palo Alto, CA 94303, USA

-#

-#   This library is free software; you can redistribute it and/or

-#   modify it under the terms of the GNU Lesser General Public

-#   License version 2.1, as published by the Free Software Foundation.

-#

-#   This library is distributed in the hope that it will be useful,

-#   but WITHOUT ANY WARRANTY; without even the implied warranty of

-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-#   Lesser General Public License for more details.

-#

-#   You should have received a copy of the GNU Lesser General Public

-#   License along with this library; if not, write to the Free Software

-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,

-#   MA  02111-1307  USA

-#

-#

-#   Sun Industry Standards Source License Version 1.1

-#   =================================================

-#   The contents of this file are subject to the Sun Industry Standards

-#   Source License Version 1.1 (the "License"); You may not use this file

-#   except in compliance with the License. You may obtain a copy of the

-#   License at http://www.openoffice.org/license.html.

-#

-#   Software provided under this License is provided on an "AS IS" basis,

-#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,

-#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,

-#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.

-#   See the License for the specific provisions governing your rights and

-#   obligations concerning the Software.

-#

-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.

-#

-#   Copyright: 2000 by Sun Microsystems, Inc.

-#

-#   All Rights Reserved.

-#

-#   Contributor(s): _______________________________________

-#

-#

-#

-#*************************************************************************

-

-PRJ=..$/..

-

-PRJNAME=libxml2

-TARGET=domimpl

-

-ENABLE_EXCEPTIONS=TRUE

-

-# --- Settings -----------------------------------------------------

-

-.INCLUDE :  settings.mk

-RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))

-

-# --- Files --------------------------------------------------------

-

-SLOFILES =	\

-    $(SLO)$/attr.obj \

-    $(SLO)$/cdatasection.obj \

-    $(SLO)$/characterdata.obj \

-    $(SLO)$/comment.obj \

-    $(SLO)$/document.obj \

-    $(SLO)$/documentbuilder.obj \

-    $(SLO)$/documentfragment.obj \

-    $(SLO)$/documenttype.obj \

-    $(SLO)$/element.obj \

-    $(SLO)$/entity.obj \

-    $(SLO)$/entityreference.obj \

-    $(SLO)$/node.obj \

-    $(SLO)$/notation.obj \

-    $(SLO)$/processinginstruction.obj \

-    $(SLO)$/text.obj \

-    $(SLO)$/domimplementation.obj \

-    $(SLO)$/elementlist.obj \

-    $(SLO)$/childlist.obj \

-    $(SLO)$/notationsmap.obj \

-    $(SLO)$/entitiesmap.obj \

-    $(SLO)$/attributesmap.obj \

-    $(SLO)$/saxbuilder.obj

-

-    

-# --- Targets ------------------------------------------------------

-

-.INCLUDE :  target.mk

-

+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.2 $
+#
+#   last change: $Author: rt $ $Date: 2004-09-08 16:15:35 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=libxml2
+TARGET=domimpl
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
+
+.IF "$(SYSTEM_LIBXML)" == "YES"
+CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+SLOFILES =	\
+    $(SLO)$/attr.obj \
+    $(SLO)$/cdatasection.obj \
+    $(SLO)$/characterdata.obj \
+    $(SLO)$/comment.obj \
+    $(SLO)$/document.obj \
+    $(SLO)$/documentbuilder.obj \
+    $(SLO)$/documentfragment.obj \
+    $(SLO)$/documenttype.obj \
+    $(SLO)$/element.obj \
+    $(SLO)$/entity.obj \
+    $(SLO)$/entityreference.obj \
+    $(SLO)$/node.obj \
+    $(SLO)$/notation.obj \
+    $(SLO)$/processinginstruction.obj \
+    $(SLO)$/text.obj \
+    $(SLO)$/domimplementation.obj \
+    $(SLO)$/elementlist.obj \
+    $(SLO)$/childlist.obj \
+    $(SLO)$/notationsmap.obj \
+    $(SLO)$/entitiesmap.obj \
+    $(SLO)$/attributesmap.obj \
+    $(SLO)$/saxbuilder.obj
+
+    
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+