INTEGRATION: CWS visibility01 (1.38.70); FILE MERGED

2005/01/14 15:33:01 mhu 1.38.70.3: #35758# Cleanup merge conflicts after resync to m69.
2005/01/12 11:31:24 mnicel 1.38.70.2: RESYNC: (1.38-1.41); FILE MERGED
There wasn't anything that was changed in workspace. So retained
whatever is new
2004/11/01 20:20:09 mhu 1.38.70.1: #i35758# Cleaned up to build single 'svx' library on all platforms, symbol visibility preparations.

1 files changed, 83 insertions, 219 deletions

diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 9b12e6bc55a3..e40eff3b80c2 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.41 $
+#   $Revision: 1.42 $
 #
-#   last change: $Author: rt $ $Date: 2004-11-26 14:23:34 $
+#   last change: $Author: kz $ $Date: 2005-01-21 17:03:11 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,10 +64,10 @@ PRJ=..
 
 PRJNAME=svx
 TARGET=svx
-#svx.hid generieren
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
-USE_LDUMP2=TRUE
+
+USE_DEFFILE=TRUE
 
 # --- Settings -----------------------------------------------------
 
@@ -76,56 +76,58 @@ USE_LDUMP2=TRUE
 .IF "$(OS)"=="IRIX"
 LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
 .ENDIF
+
 RSCLOCINC+=-I$(PRJ)$/source$/svdraw
 
-SHL4TARGET= cui$(UPD)$(DLLPOSTFIX)
-SHL4VERSIONMAP= cui.map
-SHL4IMPLIB=icui
-DEF4NAME= $(SHL4TARGET)
-SHL4DEF=$(MISC)$/$(SHL4TARGET).def
-SHL4LIBS=   $(SLB)$/cui.lib
-SHL4OBJS= \
-        $(SLO)$/cuiexp.obj     \
-        $(SLO)$/dlgfact.obj
+# --- Svx - DLL ----------
 
-SHL4STDLIBS= \
-            $(SVXLIB) \
-            $(SFX2LIB) \
-            $(GOODIESLIB) \
-            $(SVTOOLLIB) \
-            $(TKLIB) \
-            $(VCLLIB) \
-            $(SVLLIB) \
-            $(SOTLIB) \
-            $(UNOTOOLSLIB) \
-            $(TOOLSLIB) \
-            $(COMPHELPERLIB) \
-            $(UCBHELPERLIB)	\
-            $(CPPUHELPERLIB)	\
-            $(CPPULIB) \
-            $(VOSLIB) \
-            $(SALLIB) \
-                     $(XMLSCRIPTLIB) \
-            $(JVMFWKLIB) \
-            $(ICUUCLIB)	\
-            $(AVMEDIALIB)	
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1FILES=\
+    $(SLB)$/init.lib \
+    $(SLB)$/items.lib     \
+    $(SLB)$/svxlink.lib   \
+    $(SLB)$/svxrtf.lib    \
+    $(SLB)$/editeng.lib   \
+    $(SLB)$/outliner.lib \
+    $(SLB)$/dialogs.lib\
+    $(SLB)$/mnuctrls.lib  \
+    $(SLB)$/options.lib   \
+    $(SLB)$/stbctrls.lib  \
+    $(SLB)$/tbxctrls.lib  \
+    $(SLB)$/unoedit.lib   \
+    $(SLB)$/unodraw.lib	\
+    $(SLB)$/unogallery.lib\
+    $(SLB)$/gal.lib		\
+    $(SLB)$/accessibility.lib	\
+    $(SLB)$/customshapes.lib\
+    $(SLB)$/toolbars.lib \
+    $(SLB)$/properties.lib \
+    $(SLB)$/contact.lib \
+    $(SLB)$/mixer.lib \
+    $(SLB)$/event.lib \
+    $(SLB)$/animation.lib \
+    $(SLB)$/svdraw.lib \
+    $(SLB)$/form.lib \
+    $(SLB)$/fmcomp.lib \
+    $(SLB)$/engine3d.lib \
+    $(SLB)$/msfilter.lib \
+    $(SLB)$/xout.lib \
+    $(SLB)$/xml.lib
 
-.IF "$(GUI)"=="WNT"	
-SHL4STDLIBS+= \
-             Shlwapi.lib \
-             Advapi32.lib     
-.ENDIF       
-
-# --- Svx - DLL ----------
+.IF "$(GUI)" == "OS2" || "(GUIBASE)" == "WIN"
+LIB1FILES+=$(SLB)$/ibrwimp.lib
+.ENDIF # (OS2 || WIN)
 
 HELPIDFILES=    ..$/inc$/helpid.hrc
 
+# svx
 SHL1TARGET= svx$(UPD)$(DLLPOSTFIX)
-SHL1IMPLIB= svx
-SVXLOKAL=	$(LB)$/svx.lib
-SHL1BASE  = 0x1d800000
+SHL1IMPLIB= i$(TARGET)
+SHL1USE_EXPORTS=ordinal
 
+SHL1LIBS=	$(LIB1TARGET)
 SHL1STDLIBS= \
+            $(AVMEDIALIB) \
             $(SFX2LIB) \
             $(XMLOFFLIB) \
             $(GOODIESLIB) \
@@ -138,144 +140,64 @@ SHL1STDLIBS= \
             $(SOTLIB) \
             $(UNOTOOLSLIB) \
             $(TOOLSLIB) \
+            $(XMLSCRIPTLIB) \
             $(COMPHELPERLIB) \
             $(UCBHELPERLIB)	\
             $(CPPUHELPERLIB)	\
             $(CPPULIB) \
-                        $(XMLSCRIPTLIB) \
             $(VOSLIB) \
             $(SALLIB) \
-                     $(XMLSCRIPTLIB) \
-            $(ICUUCLIB) \
-            $(AVMEDIALIB)	
+            $(ICUUCLIB)
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=\
-            $(SHELLLIB)
+SHL1STDLIBS+=$(SHELLLIB)
 .ENDIF # WNT
 
-.IF "$(BIG_SVX)"==""
-SHL1STDLIBS+=\
-            $(LB)$/dl.lib
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-SHL1DEPN=       $(SLB)$/svx.lib $(LB)$/dl.lib
-.ENDIF # WNT
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=	$(SHL1TARGET)
+DEFLIB1NAME=$(TARGET)
 
-SHL1LIBS=       $(SLB)$/svx.lib
+# cui
+SHL2TARGET= cui$(UPD)$(DLLPOSTFIX)
+SHL2VERSIONMAP= cui.map
+SHL2IMPLIB=icui
 
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME        =$(SHL1TARGET)
-DEF1DEPN        =$(MISC)$/$(SHL1TARGET).flt
-DEFLIB1NAME=svx
-DEF1DES		= Rtf, Edt, Outliner, SvDraw, Form, Fmcomp, Engine3D, MSFilter
-# THB: exports list svx checked for 6.0 Final 6.12.2001
-DEF1EXPORTFILE	= svx.dxp
+SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
+DEF2NAME=	$(SHL2TARGET)
 
-.IF "$(BIG_SVX)"==""
+SHL2LIBS=	$(SLB)$/cui.lib
+SHL2OBJS= \
+        $(SLO)$/cuiexp.obj     \
+        $(SLO)$/dlgfact.obj
 
-SHL2TARGET= dl$(UPD)$(DLLPOSTFIX)
-SHL2IMPLIB= dl
-SVXLOKAL+=	$(LB)$/dl.lib
-SHL2BASE  = 0x1db00000
 SHL2STDLIBS= \
             $(SVXLIB) \
-            $(SALLIB) \
-            $(VOSLIB) \
-            $(TOOLSLIB) \
-            $(SVTOOLLIB) \
-            $(SVLLIB)	\
-            $(SVLIB) \
-            $(SOTLIB) \
-            $(XMLOFFLIB) \
+            $(AVMEDIALIB) \
             $(SFX2LIB) \
             $(GOODIESLIB) \
-            $(BASEGFXLIB) \
-            $(BASICLIB) \
-            $(SVMEMLIB) \
+            $(SVTOOLLIB) \
             $(TKLIB) \
-            $(CPPULIB) \
-            $(CPPUHELPERLIB) \
+            $(VCLLIB) \
+            $(SVLLIB) \
+            $(SOTLIB) \
             $(UNOTOOLSLIB) \
-            $(UCBHELPERLIB) \
-                     $(XMLSCRIPTLIB) \
+            $(TOOLSLIB) \
             $(COMPHELPERLIB) \
-            $(AVMEDIALIB)	
-
-.IF "$(GUI)"=="WNT"
-SHL2STDLIBS+=\
-            $(SHELLLIB)
-.ENDIF
-
-.IF "$(SOLAR_JAVA)" != ""
-SHL2STDLIBS+=\
-        $(SJLIB)
-.ENDIF
-
-
-SHL2DEPN=       $(SLB)$/dl.lib $(LB)$/svx.lib
-SHL2LIBS=       $(SLB)$/dl.lib
-SHL2OBJS+=      $(SLO)$/svxempty.obj
-
-SHL2DEF=        $(MISC)$/$(SHL2TARGET).def
-DEF2NAME        =$(SHL2TARGET)
-DEF2DEPN        =$(MISC)$/$(SHL2TARGET).flt
-DEFLIB2NAME=dl
-DEF2DES     =SvDraw, Form, Fmcomp, Engine3D, XOutDev, MSFilter
-
-.ENDIF
-
-LIBEXTRAFILES=\
-        $(LIBPRE) $(SLB)$/properties.lib \
-        $(LIBPRE) $(SLB)$/contact.lib \
-        $(LIBPRE) $(SLB)$/mixer.lib \
-        $(LIBPRE) $(SLB)$/event.lib \
-        $(LIBPRE) $(SLB)$/animation.lib \
-        $(LIBPRE) $(SLB)$/svdraw.lib \
-        $(LIBPRE) $(SLB)$/form.lib \
-        $(LIBPRE) $(SLB)$/fmcomp.lib \
-        $(LIBPRE) $(SLB)$/engine3d.lib \
-        $(LIBPRE) $(SLB)$/msfilter.lib \
-        $(LIBPRE) $(SLB)$/xout.lib \
-        $(LIBPRE) $(SLB)$/xml.lib
-
-LIB1TARGET      =$(SLB)$/svx.lib
-LIB1FILES       = \
-            $(LIBPRE) $(SLB)$/items.lib     \
-            $(LIBPRE) $(SLB)$/svxlink.lib   \
-            $(LIBPRE) $(SLB)$/svxrtf.lib    \
-            $(LIBPRE) $(SLB)$/editeng.lib   \
-            $(LIBPRE) $(SLB)$/outliner.lib \
-            $(LIBPRE) $(SLB)$/dialogs.lib\
-            $(LIBPRE) $(SLB)$/mnuctrls.lib  \
-            $(LIBPRE) $(SLB)$/options.lib   \
-            $(LIBPRE) $(SLB)$/stbctrls.lib  \
-            $(LIBPRE) $(SLB)$/tbxctrls.lib  \
-            $(LIBPRE) $(SLB)$/unoedit.lib   \
-            $(LIBPRE) $(SLB)$/unodraw.lib	\
-            $(LIBPRE) $(SLB)$/unogallery.lib\
-            $(LIBPRE) $(SLB)$/gal.lib		\
-            $(LIBPRE) $(SLB)$/accessibility.lib	\
-            $(LIBPRE) $(SLB)$/customshapes.lib\
-            $(LIBPRE) $(SLB)$/toolbars.lib \
-            $(LIBPRE) $(SLB)$/init.lib
-
-#            $(SLO)$/docrecovery.obj
-
-.IF "$(BIG_SVX)"==""
-LIB2TARGET      =$(SLB)$/dl.lib
-LIB2FILES       = $(LIBEXTRAFILES)
-.ELSE
-LIB1FILES+=$(LIBEXTRAFILES)
-.ENDIF
-
-.IF "$(GUI)" == "OS2" || "(GUIBASE)" == "WIN"
-LIB1FILES  += \
-            $(LIBPRE) $(SLB)$/ibrwimp.lib
-.ENDIF
+            $(UCBHELPERLIB)	\
+            $(CPPUHELPERLIB)	\
+            $(CPPULIB) \
+            $(VOSLIB) \
+            $(SALLIB) \
+            $(JVMFWKLIB) \
+            $(ICUUCLIB)
 
+.IF "$(GUI)"=="WNT"	
+SHL2STDLIBS+= \
+             Shlwapi.lib \
+             Advapi32.lib     
+.ENDIF # WNT
 
+# Resource files
 SRSFILELIST=\
                 $(SRS)$/svdstr.srs      \
                 $(SRS)$/editeng.srs     \
@@ -306,71 +228,13 @@ ALL:
     @echo nothing to depend on
 
 .ELSE
-.IF "$(GUI)"=="WNT"
-
-
-.IF "$(BIG_SVX)"==""
-ALL:      \
-        $(MAKELANGDIR)  \
-            $(SLB)$/dl.lib  $(SLB)$/svx.lib \
-            $(LB)$/dl.lib   $(LB)$/svx.lib \
-          $(MISC)$/linkinc.ls                   \
-          ALLTAR
-.ELSE
-ALL:      \
-        $(MAKELANGDIR)  \
-            $(SLB)$/svx.lib \
-            $(LB)$/svx.lib \
-          $(MISC)$/linkinc.ls                   \
-          ALLTAR
-.ENDIF
-
-.ENDIF			# "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
 ALL: \
         $(MAKELANGDIR)  \
         ALLTAR
-.ENDIF
-.ENDIF			#F "$(depend)" != ""
-
-# --- Targets -------------------------------------------------------
 
+.ENDIF # "$(depend)" != ""
 
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    +$(TYPE) svx.flt >$@
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    +$(TYPE) dl.flt >$@
-
-$(MISC)$/$(SHL4TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    +$(TYPE) cui.flt >$@
+# --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-
-implib1: $(MISC)\svx1.def
-    implib /noi $(LB)\svx1.lib $(MISC)\svx1.def
-
-implib2: $(MISC)\svx2.def
-    implib /noi $(LB)\svx2.lib $(MISC)\svx2.def
-
-implib3: $(MISC)\dl1.def
-    implib /noi $(LB)\dl1.lib $(MISC)\dl1.def
-
-implib4: $(MISC)\dl2.def
-    implib /noi $(LB)\dl2.lib $(MISC)\dl2.def
-
-implib_defs: $(SHL1DEF) $(SHL2DEF)
-    +-$(RM) $(MISC)$/svx1.def
-    +-$(RM) $(MISC)$/svx2.def
-    +-$(RM) $(MISC)$/dl1.def
-    +-$(RM) $(MISC)$/dl2.def
-    splitdef $(SHL1DEF) $(MISC)$/svx1.def $(MISC)$/svx2.def
-    splitdef $(SHL2DEF) $(MISC)$/dl1.def $(MISC)$/dl2.def