svx: remove Package_sdi

Change-Id: I0c648ca1b1f3cc22244d660e032bacbdbe0f642e

basctl/Library_basctl.mk

@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
 $(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
 
 $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))

basctl/sdi/basslots.sdi

@@ -28,9 +28,9 @@ SlotIdFile( "basslots.hrc" )
     //=========================================================================
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
 
     include "baside.sdi"
 

sc/Library_sc.mk

@@ -589,6 +589,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
 $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
 	-I$(SRCDIR)/sc/inc \
 	-I$(SRCDIR)/sc/sdi \
+	-I$(SRCDIR)/svx/sdi \
 	-I$(SRCDIR)/sfx2/sdi \
 	$$(INCLUDE) \
 ))

sc/sdi/scslots.sdi

@@ -42,9 +42,9 @@ ModulePrefix( "Sc" )
     // bei Problemen ggF. "von Hand" includen (=Copy/Paste)
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
 
     include "scalc.sdi"
     include "docsh.sdi"

sd/Library_sd.mk

@@ -16,6 +16,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots))
 $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/sdi \
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
@@ -25,6 +26,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdgslots,sd/sdi/sdgslots))
 $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/sdi \
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))

sd/sdi/sdgslots.sdi

@@ -27,9 +27,9 @@ ModulePrefix( "Sd" )
 {
         include "sfxitems.sdi"
         include "sfx.sdi"
-        include "svx/svxitems.sdi"
-        include "svx/xoitems.sdi"
-        include "svx/svx.sdi"
+        include "svxitems.sdi"
+        include "xoitems.sdi"
+        include "svx.sdi"
 
         item UINT16 TbxImageItem;
 

sd/sdi/sdslots.sdi

@@ -28,9 +28,9 @@ ModulePrefix( "Sd" )
 {
         include "sfxitems.sdi"
         include "sfx.sdi"
-        include "svx/svxitems.sdi"
-        include "svx/xoitems.sdi"
-        include "svx/svx.sdi"
+        include "svxitems.sdi"
+        include "xoitems.sdi"
+        include "svx.sdi"
 
         item UINT16 TbxImageItem;
 

starmath/Library_sm.mk

@@ -93,6 +93,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
 $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
         -I$(SRCDIR)/starmath/inc \
         -I$(SRCDIR)/starmath/sdi \
+        -I$(SRCDIR)/svx/sdi \
         -I$(SRCDIR)/sfx2/sdi \
         $$(INCLUDE) \
 ))

starmath/sdi/smslots.sdi

@@ -30,9 +30,9 @@ StarMath
 {
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
     include "smath.sdi"
     interface StarMath
     [

svx/Library_svxcore.mk

@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
 
 $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
 
-$(eval $(call gb_Library_use_packages,svxcore,\
-    svx_sdi \
-))
-
 $(eval $(call gb_Library_use_custom_headers,svxcore,\
 	officecfg/registry \
 ))

svx/Module_svx.mk

@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,svx,\
     AllLangResTarget_gal \
     AllLangResTarget_textconversiondlgs \
     Package_globlmn_hrc \
-    Package_sdi \
     UIConfig_svx \
 ))
 

svx/Package_sdi.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,svx_sdi,$(SRCDIR)/svx/sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svx.sdi,svx.sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svxitems.sdi,svxitems.sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/xoitems.sdi,xoitems.sdi))
-
-# vim: set noet sw=4 ts=4:

sw/Library_sw.mk

@@ -743,6 +743,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
 $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/sdi \
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))

sw/sdi/swslots.sdi

@@ -28,9 +28,9 @@ ModulePrefix( "Sw" )
 {
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
 
     item String TbxDummyItem;
 /*