expat/expat-2.1.0.patch

   1 --- misc/expat-2.1.0/lib/makefile.mk    Wed Aug 20 14:33:55 2008
   2 +++ misc/build/expat-2.1.0/lib/makefile.mk      Wed Aug 20 14:26:42 2008
   3 @@ -1 +1,90 @@
   4 -dummy
   5 +#*************************************************************************
   6 +#
   7 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   8 +#
   9 +# Copyright 2000, 2010 Oracle and/or its affiliates.
  10 +#
  11 +# OpenOffice.org - a multi-platform office productivity suite
  12 +#
  13 +# This file is part of OpenOffice.org.
  14 +#
  15 +# OpenOffice.org is free software: you can redistribute it and/or modify
  16 +# it under the terms of the GNU Lesser General Public License version 3
  17 +# only, as published by the Free Software Foundation.
  18 +#
  19 +# OpenOffice.org is distributed in the hope that it will be useful,
  20 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  21 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  22 +# GNU Lesser General Public License version 3 for more details
  23 +# (a copy is included in the LICENSE file that accompanied this code).
  24 +#
  25 +# You should have received a copy of the GNU Lesser General Public License
  26 +# version 3 along with OpenOffice.org.  If not, see
  27 +# <http://www.openoffice.org/license.html>
  28 +# for a copy of the LGPLv3 License.
  29 +#
  30 +#*************************************************************************
  31 +PRJ=../../../../..
  32 +
  33 +PRJNAME=expat
  34 +TARGET=expat
  35 +LIBTARGET=NO
  36 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
  37 +VISIBILITY_HIDDEN=TRUE
  38 +
  39 +# --- Settings -----------------------------------------------------
  40 +.INCLUDE :  settings.mk
  41 +# --- Files --------------------------------------------------------
  42 +
  43 +CFLAGS+=-I..
  44 +
  45 +.IF "$(OS)"=="WNT"
  46 +CDEFS+=-DCOMPILED_FROM_DSP
  47 +.ELSE
  48 +CDEFS+=-DHAVE_EXPAT_CONFIG_H
  49 +.ENDIF
  50 +
  51 +.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
  52 +CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
  53 +.ENDIF # "$(OS)"=="MACOSX"
  54 +
  55 +SLOFILES=$(SLO)/xmlparse.obj \
  56 +         $(SLO)/xmlrole.obj \
  57 +         $(SLO)/xmltok.obj
  58 +
  59 +SECOND_BUILD=UNICODE
  60 +UNICODE_SLOFILES=$(SLO)/xmlparse.obj
  61 +UNICODECDEFS+=-DXML_UNICODE
  62 +
  63 +LIB1ARCHIV=$(LB)/libascii_$(TARGET)_xmlparse.a
  64 +LIB1TARGET=$(SLB)/ascii_$(TARGET)_xmlparse.lib
  65 +LIB1OBJFILES=$(SLO)/xmlparse.obj
  66 +
  67 +LIB2ARCHIV=$(LB)/lib$(TARGET)_xmlparse.a
  68 +LIB2TARGET=$(SLB)/$(TARGET)_xmlparse.lib
  69 +LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
  70 +
  71 +LIB3ARCHIV=$(LB)/lib$(TARGET)_xmltok.a
  72 +LIB3TARGET=$(SLB)/$(TARGET)_xmltok.lib
  73 +LIB3OBJFILES=$(SLO)/xmlrole.obj $(SLO)/xmltok.obj
  74 +
  75 +.IF "$(BUILD_X64)"!=""
  76 +# ---------------- X64 stuff special ---------------------
  77 +#  use UNICODE only because shell/shlxthandler
  78 +#  doesn't link against ascii_expat_xmlparse
  79 +#---------------------------------------------------------
  80 +SLOFILES_X64=$(SLO_X64)/xmlparse.obj \
  81 +             $(SLO_X64)/xmlrole.obj \
  82 +             $(SLO_X64)/xmltok.obj
  83 +CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
  84 +CFLAGS_X64+=-I..
  85 +LIB1TARGET_X64=$(SLB_X64)/$(TARGET)_xmlparse.lib
  86 +LIB1OBJFILES_X64=$(SLO_X64)/xmlparse.obj
  87 +LIB2TARGET_X64=$(SLB_X64)/$(TARGET)_xmltok.lib
  88 +LIB2OBJFILES_X64=$(SLO_X64)/xmlrole.obj $(SLO_X64)/xmltok.obj
  89 +.ENDIF # "$(BUILD_X64)"!=""
  90 +
  91 +# --- Targets ------------------------------------------------------
  92 +.INCLUDE :  set_wntx64.mk
  93 +.INCLUDE :     target.mk
  94 +.INCLUDE :  tg_wntx64.mk