dtardon01: update to DEV300_m72

1 files changed, 34 insertions, 72 deletions

diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 070aecc308b6..0006fa2ff5fe 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.61 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,99 +32,49 @@ TARGET=svx
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 
-USE_DEFFILE=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
 RSCLOCINC+=-I$(PRJ)$/source$/svdraw
 
-# --- Svx - DLL ----------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=\
-    $(SLB)$/svdraw.lib \
-    $(SLB)$/form.lib
-
-.IF "(GUIBASE)" == "WIN"
-LIB1FILES+=$(SLB)$/ibrwimp.lib
-.ENDIF # (WIN)
-
-LIB2TARGET= $(SLB)$/$(TARGET)_2.lib
-LIB2FILES=\
-    $(SLB)$/items.lib     \
-    $(SLB)$/dialogs.lib	\
-    $(SLB)$/mnuctrls.lib  \
-    $(SLB)$/options.lib   \
-    $(SLB)$/stbctrls.lib  \
-    $(SLB)$/tbxctrls.lib  \
-    $(SLB)$/unoedit.lib   \
-    $(SLB)$/smarttags.lib
-
-LIB3TARGET= $(SLB)$/$(TARGET)_3.lib
-LIB3FILES=\
-    $(SLB)$/unodraw.lib	\
-    $(SLB)$/unogallery.lib\
-    $(SLB)$/accessibility.lib	\
-    $(SLB)$/customshapes.lib
+HELPIDFILES=    ..$/inc$/helpid.hrc
 
-LIB4TARGET= $(SLB)$/$(TARGET)_4.lib
-LIB4FILES=\
-    $(SLB)$/fmcomp.lib \
-    $(SLB)$/engine3d.lib \
-    $(SLB)$/table.lib
+# svxcore
+SHL1TARGET= svxcore$(DLLPOSTFIX)
+SHL1IMPLIB= isvxcore
+SHL1USE_EXPORTS=name
 
-# Objects needed for the svxcore library.
-LIB5TARGET= $(SLB)$/$(TARGET)_5.lib
-LIB5FILES=\
-    $(SLB)$/accessibility-core.lib \
+SHL1LIBS= \
     $(SLB)$/animation.lib \
     $(SLB)$/attribute.lib \
     $(SLB)$/contact.lib \
     $(SLB)$/customshapes-core.lib \
     $(SLB)$/dialogs-core.lib \
-    $(SLB)$/editeng.lib \
     $(SLB)$/engine3d-core.lib \
     $(SLB)$/event.lib \
     $(SLB)$/fmcomp-core.lib \
     $(SLB)$/form-core.lib \
     $(SLB)$/gal.lib \
     $(SLB)$/items-core.lib \
-    $(SLB)$/options-core.lib
-
-LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
-LIB6FILES=\
-    $(SLB)$/outliner.lib \
     $(SLB)$/overlay.lib \
     $(SLB)$/primitive2d.lib \
     $(SLB)$/primitive3d.lib \
     $(SLB)$/properties.lib \
     $(SLB)$/svdraw-core.lib \
-    $(SLB)$/svxlink.lib \
-    $(SLB)$/svxrtf-core.lib \
-    $(SLB)$/svxrtf.lib \
     $(SLB)$/table-core.lib \
-    $(SLB)$/tbxctrls-core.lib  \
+    $(SLB)$/tbxctrls-core.lib \
     $(SLB)$/toolbars.lib \
     $(SLB)$/unodraw-core.lib \
-    $(SLB)$/unoedit-core.lib   \
     $(SLB)$/xml.lib \
     $(SLB)$/xout.lib
 
-HELPIDFILES=    ..$/inc$/helpid.hrc
-
-# svxcore
-SHL1TARGET= svxcore$(DLLPOSTFIX)
-SHL1IMPLIB= isvxcore
-SHL1USE_EXPORTS=name
-SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET)
 
 SHL1STDLIBS= \
+             $(EDITENGLIB) \
              $(AVMEDIALIB) \
              $(SFX2LIB) \
              $(XMLOFFLIB) \
-             $(GOODIESLIB) \
              $(BASEGFXLIB) \
              $(DRAWINGLAYERLIB) \
              $(LNGLIB) \
@@ -152,7 +98,7 @@ SHL1STDLIBS= \
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)_5 $(TARGET)_6
+DEFLIB1NAME=$(SHL1LIBS:b)
 
 # svx
 SHL2TARGET= svx$(DLLPOSTFIX)
@@ -160,12 +106,32 @@ SHL2IMPLIB= i$(TARGET)
 SHL2USE_EXPORTS=name
 SHL2DEPN=$(SHL1TARGETN)
 
-SHL2LIBS= $(LIB1TARGET) $(LIB2TARGET) $(LIB3TARGET) $(LIB4TARGET)
+SHL2LIBS= \
+    $(SLB)$/svdraw.lib \
+    $(SLB)$/form.lib \
+    $(SLB)$/items.lib     \
+    $(SLB)$/dialogs.lib	\
+    $(SLB)$/mnuctrls.lib  \
+    $(SLB)$/stbctrls.lib  \
+    $(SLB)$/tbxctrls.lib  \
+    $(SLB)$/smarttags.lib \
+    $(SLB)$/unodraw.lib	\
+    $(SLB)$/unogallery.lib\
+    $(SLB)$/accessibility.lib	\
+    $(SLB)$/customshapes.lib \
+    $(SLB)$/fmcomp.lib \
+    $(SLB)$/engine3d.lib \
+    $(SLB)$/table.lib
+
+.IF "(GUIBASE)" == "WIN"
+SHL2LIBS+=$(SLB)$/ibrwimp.lib
+.ENDIF # (WIN)
+
 SHL2STDLIBS= \
+            $(EDITENGLIB) \
             $(SVXCORELIB) \
             $(SFX2LIB) \
             $(XMLOFFLIB) \
-            $(GOODIESLIB) \
             $(BASEGFXLIB) \
             $(DRAWINGLAYERLIB) \
             $(BASICLIB) \
@@ -192,7 +158,7 @@ SHL2STDLIBS+=$(SHELLLIB)
 
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=	$(SHL2TARGET)
-DEFLIB2NAME=$(TARGET) $(TARGET)_2 $(TARGET)_3 $(TARGET)_4
+DEFLIB2NAME=$(SHL2LIBS:b)
 
 .IF "$(debug)$(dbgutil)"!=""
 SHL2STDLIBS += $(CPPUHELPERLIB)
@@ -203,20 +169,16 @@ SHL2STDLIBS += $(CPPUHELPERLIB)
 # Resource files
 SRSFILELIST=\
         $(SRS)$/svdstr.srs \
-        $(SRS)$/editeng.srs \
-        $(SRS)$/outliner.srs \
         $(SRS)$/dialogs.srs \
         $(SRS)$/drawdlgs.srs \
         $(SRS)$/mnuctrls.srs \
         $(SRS)$/stbctrls.srs \
         $(SRS)$/tbxctrls.srs \
-        $(SRS)$/options.srs \
         $(SRS)$/svxitems.srs \
         $(SRS)$/form.srs \
         $(SRS)$/fmcomp.srs \
         $(SRS)$/engine3d.srs \
         $(SRS)$/unodraw.srs \
-        $(SRS)$/svxlink.srs \
         $(SRS)$/accessibility.srs \
         $(SRS)$/table.srs \
         $(SRS)$/toolbars.srs \