From 809ca6cc168da6ae6a9dfa6402ffaca4a4d661f0 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Tue, 11 Jan 2005 13:30:48 +0000
Subject: INTEGRATION: CWS sb25 (1.17.98); FILE MERGED 2004/12/17 14:02:37 sb
 1.17.98.5: #i37077# Fixes for WNT. 2004/12/17 13:56:36 sb 1.17.98.4: #i37077#
 Fixes for WNT. 2004/12/08 14:16:42 sb 1.17.98.3: #i37077# Adapted
 minimization of exported symbols for xo to new dynamic library xof.
 2004/12/07 16:05:19 sb 1.17.98.2: RESYNC: (1.17-1.19); FILE MERGED 2004/11/15
 16:46:25 sb 1.17.98.1: #i37077# Reduce number of exported symbols of xmloff
 dynamic library.

---
 xmloff/util/makefile.mk | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'xmloff/util')

diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 2a45a7e602f9..242dc972f250 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.19 $
+#   $Revision: 1.20 $
 #
-#   last change: $Author: obo $ $Date: 2004-11-16 13:09:33 $
+#   last change: $Author: rt $ $Date: 2005-01-11 14:30:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,11 +64,12 @@ PRJ=..
 
 PRJNAME=xmloff
 TARGET=xo
-TARGET_FILTER=xof
+USE_DEFFILE=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE: $(PRJ)$/util$/makefile.pmk
 
 # --- Allgemein ----------------------------------------------------
 NO_BSYMBOLIC=TRUE
@@ -86,10 +87,6 @@ LIB1FILES=	\
     $(SLB)$/forms.lib \
     $(SLB)$/xforms.lib
 
-LIB5TARGET= $(SLB)$/$(TARGET_FILTER).lib
-LIB5FILES= \
-    $(SLB)$/transform.lib
-
 # --- Shared-Library -----------------------------------------------
 
 .IF "$(GUI)"!="UNX"
@@ -101,6 +98,7 @@ LIB4OBJFILES=\
 
 SHL1TARGET= xo$(UPD)$(DLLPOSTFIX)
 SHL1IMPLIB= _ixo
+SHL1USE_EXPORTS=ordinal
 
 SHL1STDLIBS= \
         $(SVTOOLLIB)	\
@@ -128,9 +126,6 @@ SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(LIB1TARGET)
 
 
-SHL5TARGET= $(TARGET_FILTER)$(UPD)$(DLLPOSTFIX)
-SHL5IMPLIB= _i$(TARGET_FILTER)
-
 SHL5STDLIBS= \
         $(TOOLSLIB)         \
         $(RTLLIB)           \
@@ -147,11 +142,6 @@ SHL5STDLIBS= \
     SHL5STDLIBS += $(LIBPRE) ixo.lib
 .ENDIF
 
-SHL5DEF=    $(MISC)$/$(SHL5TARGET).def
-SHL5LIBS=   $(LIB5TARGET)
-
-SHL5VERSIONMAP=$(TARGET_FILTER).map 
-
 # --- Static-Lib ---------------------------------------------------------
 
 .IF "$(SVXLIGHT)" != "" 
@@ -171,20 +161,9 @@ LIB2FILES=  \
 # --- Def-File ---------------------------------------------------------
 
 DEF1NAME    =$(SHL1TARGET)
-DEF1DEPN    =$(MISC)$/$(SHL1TARGET).flt
 DEFLIB1NAME =xo
 DEF1DES     =XML Office Lib
-DEF1EXPORTFILE=	exports.dxp
-
-DEF5NAME    =$(SHL5TARGET)
-
 
 # --- Targets ----------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-# --- Filter -----------------------------------------------------------
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    +$(TYPE) xo.flt > $@
-
-- 
cgit