diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-07 18:51:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 17:49:55 +0200 |
| commit | 429a850d0d84176dfc1f952ec8c9d08881cf1a1c (patch) | |
| tree | 587b3e86c2bc398ad06c56e9b77f65731e16760c /sd | |
| parent | 06803677ef3b91ebaaa1d1338a403c578cebba99 (diff) | |
sfx2: remove Package_sdi
There are just a handful of sdi files in sfx2 anyway so just put
sfx2/sdi on include path.
Change-Id: Ia9be889a63ba9a2f330b505613ae38158a4b7bdf
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 2 | ||||
| -rw-r--r-- | sd/sdi/sdgslots.sdi | 4 | ||||
| -rw-r--r-- | sd/sdi/sdslots.sdi | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 5c9839af094c..8e21e8ccfd85 100644 --- a/sd/Library_sd.mk +++ b/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)/sfx2/sdi \ $$(INCLUDE) \ )) @@ -24,6 +25,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)/sfx2/sdi \ $$(INCLUDE) \ )) diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index 80c337e6163f..e3fe725f4583 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -25,8 +25,8 @@ SlotIdFile( "sdslots.hrc" ) ModulePrefix( "Sd" ) ] { - include "sfx2/sfxitems.sdi" - include "sfx2/sfx.sdi" + include "sfxitems.sdi" + include "sfx.sdi" include "svx/svxitems.sdi" include "svx/xoitems.sdi" include "svx/svx.sdi" diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index a2d8f529fae6..ab0aa38112cf 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -26,8 +26,8 @@ SlotIdFile( "sdslots.hrc" ) ModulePrefix( "Sd" ) ] { - include "sfx2/sfxitems.sdi" - include "sfx2/sfx.sdi" + include "sfxitems.sdi" + include "sfx.sdi" include "svx/svxitems.sdi" include "svx/xoitems.sdi" include "svx/svx.sdi" |