better dependencies for sdi files

3 files changed, 8 insertions, 7 deletions

diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index 227dac4db601..ba4dee265ee5 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -7,8 +7,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US
 mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\inc\svxslots.ilb %_DEST%\inc%_EXT%\svxslots.ilb
-..\%__SRC%\inc\*.ilb* %_DEST%\inc%_EXT%\*.ilb*
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
 ..\%__SRC%\lib\isvx*.lib %_DEST%\lib%_EXT%\isvx*.lib
 ..\%__SRC%\bin\gengal* %_DEST%\bin%_EXT%\gengal*
@@ -20,6 +18,9 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 
 mkdir: %_DEST%\inc%_EXT%\svx
+..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi
+..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi
+..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi
 ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
 ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
 ..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk
index 60f3cc3fb5c3..ab56159430cd 100644
--- a/svx/sdi/makefile.mk
+++ b/svx/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,10 +45,11 @@ SDI1EXPORT=svx
 # --- Files --------------------------------------------------------
 
 SVSDI1DEPEND= \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
         svxitems.sdi \
     fmslots.sdi \
     svx.sdi	\
-    $(SOLARINCXDIR)$/sfxslots.ilb	\
     xoitems.sdi \
     svxitems.sdi
 
diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi
index af1fb77adc2f..5b776c2e05d8 100644
--- a/svx/sdi/svxslots.sdi
+++ b/svx/sdi/svxslots.sdi
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "sfxslots.ilb"
-
 module
 "BD25A480-30AB-101C-A17D-000024021828"
 "C049C7E0-30AB-101C-A17D-000024021828"
@@ -36,11 +34,12 @@ SvxItems
 [
 HelpText( "Svx-Items" )
 SlotIdFile( "svxslots.hrc" )
-TypeLibFile( "svxslots.tlb" )
 ]
 {
     //=========================================================================
 
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
     include "svxitems.sdi"
     include "xoitems.sdi"
     include "svx.sdi"