[Libreoffice-commits] .: 8 commits - animations/Library_animcore.mk basegfx/StaticLibrary_basegfx_s.mk basic/CppunitTest_basic_scanner.mk chart2/AllLangResTarget_chartcontroller.mk chart2/Library_chartcontroller.mk chart2/Library_chartmodel.mk chart2/Library_charttools.mk chart2/Library_chartview.mk configure.in cui/AllLangResTarget_cui.mk cui/Library_cui.mk dbaccess/AllLangResTarget_adabasui.mk dbaccess/AllLangResTarget_dba.mk dbaccess/AllLangResTarget_dbmm.mk dbaccess/AllLangResTarget_dbui.mk dbaccess/AllLangResTarget_sdbt.mk dbaccess/Executable_odbcconfig.mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk drawinglayer/Library_drawinglayer.mk editeng/CppunitTest_editeng_borderline.mk extensions/CppunitTest_extensions_test_update.mk fileaccess/Library_fileacc.mk forms/AllLangResTarget_frm.mk forms/Library_frm.mk formula/AllLangResTarget_for.mk formula/AllLangResTarget_forui.mk formul a/Library_for.mk formula/Library_forui.mk framework/AllLangResTarget_fwe.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk idl/Executable_svidl.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk oox/Library_oox.mk padmin/Executable_spadmin.bin.mk reportdesign/AllLangResTarget_rpt.mk reportdesign/AllLangResTarget_rptui.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk RepositoryExternal.mk Repository.mk scaddins/Library_analysis.mk scaddins/Library_date.mk sc/AllLangResTarget_sc.mk sccomp/Library_solver.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTes t_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_vbaobj.mk sc/source sd/AllLangResTarget_sd.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.mk sd/CppunitTest_sd_uimpress.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sfx2/AllLangResTarget_sfx2.mk sfx2/Library_qstart.mk sfx2/Library_sfx.mk slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk solenv/gbuild sot/CppunitTest_sot_test_sot.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_sm.mk svl/AllLangResTarget_svl.mk svl/CppunitTest_svl_lngmisc.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svtools/AllLangResTarget_svt.mk svtools/CppunitTest_svtools_filters_test.mk svtools/Executable_bmp.mk svtools/Ex ecutable_bmpsum.mk svtools/Executable_g2g.mk svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svx/AllLangResTarget_gal.mk svx/AllLangResTarget_ofa.mk svx/AllLangResTarget_svx.mk svx/AllLangResTarget_textconversiondlgs.mk sw/AllLangResTarget_sw.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_swdoc_test.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk test/Library_subsequenttest.mk test/Library_test.mk tools/Executable_bestreversemap.mk unotools/Library_utl.mk unusedcode.easy vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/StaticLibrary_vclmain.mk wizards/AllLangResTarget_cal.mk wizards/AllLangResTarget_dbw.mk wizards/AllLangResTarget_eur.mk wizards/AllLangResTarget_imp.mk wizards/AllLangResTarget_tpl.mk wi zards/AllLangResTarget_wwz.mk wizards/AllLangResTarget_wzi.mk writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_rtftok.mk writerfilter/Library_writerfilter_uno.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Fri Feb 10 12:45:30 PST 2012
Repository.mk | 11 +++--
RepositoryExternal.mk | 5 ++
animations/Library_animcore.mk | 6 ---
basegfx/StaticLibrary_basegfx_s.mk | 1
basic/CppunitTest_basic_scanner.mk | 1
chart2/AllLangResTarget_chartcontroller.mk | 1
chart2/Library_chartcontroller.mk | 1
chart2/Library_chartmodel.mk | 1
chart2/Library_charttools.mk | 1
chart2/Library_chartview.mk | 1
configure.in | 5 +-
cui/AllLangResTarget_cui.mk | 1
cui/Library_cui.mk | 1
dbaccess/AllLangResTarget_adabasui.mk | 1
dbaccess/AllLangResTarget_dba.mk | 1
dbaccess/AllLangResTarget_dbmm.mk | 1
dbaccess/AllLangResTarget_dbui.mk | 1
dbaccess/AllLangResTarget_sdbt.mk | 1
dbaccess/Executable_odbcconfig.mk | 1
dbaccess/Library_adabasui.mk | 1
dbaccess/Library_dba.mk | 1
dbaccess/Library_dbaxml.mk | 1
dbaccess/Library_dbmm.mk | 1
dbaccess/Library_dbu.mk | 1
dbaccess/Library_sdbt.mk | 1
drawinglayer/Library_drawinglayer.mk | 1
editeng/CppunitTest_editeng_borderline.mk | 1
extensions/CppunitTest_extensions_test_update.mk | 1
fileaccess/Library_fileacc.mk | 1
forms/AllLangResTarget_frm.mk | 2 -
forms/Library_frm.mk | 1
formula/AllLangResTarget_for.mk | 1
formula/AllLangResTarget_forui.mk | 1
formula/Library_for.mk | 1
formula/Library_forui.mk | 1
framework/AllLangResTarget_fwe.mk | 2 -
framework/Library_fwe.mk | 2 -
framework/Library_fwi.mk | 2 -
framework/Library_fwk.mk | 2 -
framework/Library_fwl.mk | 2 -
framework/Library_fwm.mk | 2 -
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 1
idl/Executable_svidl.mk | 1
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 1
lotuswordpro/Library_lwpft.mk | 1
oox/Library_oox.mk | 1
padmin/Executable_spadmin.bin.mk | 1
reportdesign/AllLangResTarget_rpt.mk | 1
reportdesign/AllLangResTarget_rptui.mk | 2 -
reportdesign/Library_rpt.mk | 1
reportdesign/Library_rptui.mk | 1
reportdesign/Library_rptxml.mk | 1
sc/AllLangResTarget_sc.mk | 1
sc/CppunitTest_sc_databaserangeobj.mk | 1
sc/CppunitTest_sc_datapilotfieldobj.mk | 1
sc/CppunitTest_sc_datapilottableobj.mk | 1
sc/CppunitTest_sc_filters_test.mk | 1
sc/CppunitTest_sc_macros_test.mk | 1
sc/CppunitTest_sc_namedrangeobj.mk | 1
sc/CppunitTest_sc_namedrangesobj.mk | 1
sc/CppunitTest_sc_subsequent_filters_test.mk | 1
sc/CppunitTest_sc_tableautoformatfield.mk | 1
sc/CppunitTest_sc_tablesheetsobj.mk | 1
sc/CppunitTest_sc_ucalc.mk | 1
sc/Library_sc.mk | 1
sc/Library_scd.mk | 1
sc/Library_scfilt.mk | 3 -
sc/Library_scui.mk | 1
sc/Library_vbaobj.mk | 2 -
sc/source/filter/excel/xlescher.cxx | 26 -------------
sc/source/filter/inc/xiescher.hxx | 6 ---
sc/source/filter/inc/xlescher.hxx | 15 -------
scaddins/Library_analysis.mk | 1
scaddins/Library_date.mk | 1
sccomp/Library_solver.mk | 5 --
sd/AllLangResTarget_sd.mk | 1
sd/CppunitTest_sd_filters_test.mk | 1
sd/CppunitTest_sd_regression_test.mk | 1
sd/CppunitTest_sd_uimpress.mk | 1
sd/Library_sd.mk | 3 -
sd/Library_sdd.mk | 1
sd/Library_sdfilt.mk | 2 -
sd/Library_sdui.mk | 1
sfx2/AllLangResTarget_sfx2.mk | 2 -
sfx2/Library_qstart.mk | 1
sfx2/Library_sfx.mk | 2 -
slideshow/CppunitTest_slideshow.mk | 1
slideshow/Executable_demoshow.mk | 1
slideshow/Library_OGLTrans.mk | 1
slideshow/Library_slideshow.mk | 1
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 11 +----
sot/CppunitTest_sot_test_sot.mk | 1
starmath/CppunitTest_starmath_qa_cppunit.mk | 1
starmath/Library_sm.mk | 2 -
svl/AllLangResTarget_svl.mk | 1
svl/CppunitTest_svl_lngmisc.mk | 1
svl/Library_fsstorage.mk | 3 -
svl/Library_passwordcontainer.mk | 3 -
svtools/AllLangResTarget_svt.mk | 1
svtools/CppunitTest_svtools_filters_test.mk | 1
svtools/Executable_bmp.mk | 3 -
svtools/Executable_bmpsum.mk | 1
svtools/Executable_g2g.mk | 1
svtools/Library_hatchwindowfactory.mk | 4 --
svtools/Library_svt.mk | 4 --
svx/AllLangResTarget_gal.mk | 1
svx/AllLangResTarget_ofa.mk | 1
svx/AllLangResTarget_svx.mk | 1
svx/AllLangResTarget_textconversiondlgs.mk | 1
sw/AllLangResTarget_sw.mk | 2 -
sw/CppunitTest_sw_filters_test.mk | 1
sw/CppunitTest_sw_macros_test.mk | 1
sw/CppunitTest_sw_swdoc_test.mk | 1
sw/Library_msword.mk | 4 --
sw/Library_sw.mk | 2 -
sw/Library_swd.mk | 2 -
sw/Library_swui.mk | 1
sw/Library_vbaswobj.mk | 2 -
test/Library_subsequenttest.mk | 5 --
test/Library_test.mk | 5 --
tools/Executable_bestreversemap.mk | 1
unotools/Library_utl.mk | 1
unusedcode.easy | 2 -
vcl/Library_desktop_detector.mk | 1
vcl/Library_vcl.mk | 1
vcl/Library_vclplug_gen.mk | 1
vcl/Library_vclplug_gtk.mk | 1
vcl/Library_vclplug_gtk3.mk | 1
vcl/Library_vclplug_kde.mk | 1
vcl/Library_vclplug_kde4.mk | 1
vcl/Library_vclplug_svp.mk | 1
vcl/StaticLibrary_vclmain.mk | 1
wizards/AllLangResTarget_cal.mk | 1
wizards/AllLangResTarget_dbw.mk | 1
wizards/AllLangResTarget_eur.mk | 1
wizards/AllLangResTarget_imp.mk | 1
wizards/AllLangResTarget_tpl.mk | 1
wizards/AllLangResTarget_wwz.mk | 1
wizards/AllLangResTarget_wzi.mk | 1
writerfilter/CppunitTest_writerfilter_doctok.mk | 1
writerfilter/Library_doctok.mk | 1
writerfilter/Library_ooxml.mk | 1
writerfilter/Library_resourcemodel.mk | 1
writerfilter/Library_rtftok.mk | 1
writerfilter/Library_writerfilter_uno.mk | 1
145 files changed, 17 insertions(+), 254 deletions(-)
New commits:
commit 6396ab80dbb0fd60536c42e9c66b568f1e31418a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Feb 10 12:02:22 2012 +0100
Repository.mk: move test libraries to PLAINLIBS_NONE
diff --git a/Repository.mk b/Repository.mk
index 5adc794..de2a1eb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -314,6 +314,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+ subsequenttest \
+ test \
+ unoexceptionprotector \
+ unotest \
+))
+
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
sal_textenc \
xmlreader \
@@ -344,8 +351,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
sofficeapp \
srtrs1 \
store \
- subsequenttest \
- test \
textconv_dict \
ucb1 \
ucpdav1 \
@@ -353,9 +358,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ucpftp1 \
ucphier1 \
ucppkg1 \
- unoexceptionprotector \
unopkgapp \
- unotest \
unsafe_uno \
updchk \
xmlsecurity \
commit 55cac8c903efb51805448de6bf261619ce7d2a3d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Feb 9 20:37:03 2012 +0100
unusedcode: remove XclObjId and unused typedefs
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 3d87a89..4c894bf 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -46,32 +46,6 @@ using ::com::sun::star::drawing::XControlShape;
using ::com::sun::star::awt::XControlModel;
using ::com::sun::star::script::ScriptEventDescriptor;
-// Structs and classes ========================================================
-
-XclObjId::XclObjId() :
- mnScTab( SCTAB_INVALID ),
- mnObjId( EXC_OBJ_INVALID_ID )
-{
-}
-
-XclObjId::XclObjId( SCTAB nScTab, sal_uInt16 nObjId ) :
- mnScTab( nScTab ),
- mnObjId( nObjId )
-{
-}
-
-bool operator==( const XclObjId& rL, const XclObjId& rR )
-{
- return (rL.mnScTab == rR.mnScTab) && (rL.mnObjId == rR.mnObjId);
-}
-
-bool operator<( const XclObjId& rL, const XclObjId& rR )
-{
- return (rL.mnScTab < rR.mnScTab) || ((rL.mnScTab == rR.mnScTab) && (rL.mnObjId < rR.mnObjId));
-}
-
-// ----------------------------------------------------------------------------
-
namespace {
/** Returns the scaling factor to calculate coordinates from twips. */
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index e7e2db5..2843b4a 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1258,12 +1258,6 @@ private:
// ------------------------------------------------------------------------
private:
- typedef ::std::map< sal_Size, XclImpDrawObjRef > XclImpObjMap;
- typedef ::std::map< XclObjId, XclImpDrawObjRef > XclImpObjMapById;
- typedef boost::shared_ptr< XclImpObjTextData > XclImpObjTextRef;
- typedef ::std::map< sal_Size, XclImpObjTextRef > XclImpObjTextMap;
- typedef ::std::vector< XclObjId > XclObjIdVec;
-
typedef ::std::map< sal_uInt16, String > DefObjNameMap;
typedef boost::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef;
typedef ::std::map< SCTAB, XclImpSheetDrawingRef > XclImpSheetDrawingMap;
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 04396af..6213f12 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -296,21 +296,6 @@ const sal_uInt16 EXC_ID_TXO = 0x01B6;
// Structs and classes ========================================================
-/** Identifies a drawing object by sheet index and object identifier. */
-struct XclObjId
-{
- SCTAB mnScTab; /// Calc sheet index.
- sal_uInt16 mnObjId; /// Excel object identifier.
-
- explicit XclObjId();
- explicit XclObjId( SCTAB nScTab, sal_uInt16 nObjId );
-};
-
-bool operator==( const XclObjId& rL, const XclObjId& rR );
-bool operator<( const XclObjId& rL, const XclObjId& rR );
-
-// ----------------------------------------------------------------------------
-
/** Represents the position (anchor) of an object in a Calc document. */
struct XclObjAnchor : public XclRange
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 6fb76fa..455ead8 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -670,8 +670,6 @@ XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
XclExpName::IsHidden() const
XclExpPivotCache::GetFieldAcc(String const&)
XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFormatRun> > const&)
-XclObjId::XclObjId()
-XclObjId::XclObjId(short, unsigned short)
XclRoot::GetDatabaseRanges() const
XclRoot::GetPixelXFromHmm(int) const
XclRoot::GetPixelYFromHmm(int) const
commit a8326b3af400270f5c6819204fd5f56d7abdd188
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Feb 7 19:22:28 2012 +0100
hopefully we don't need this hack
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index a09c094..c106845 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -246,20 +246,13 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
# break the dummy implementations on unx*
-
-# This file:/// -> file:!!! -> file:/// substitution is to protect the
-# slashes after file: in a file: URL from being unduplicated by the
-# // -> / substitution.
define gb_Helper_convert_native
$(strip \
-$(subst file:!!!,file:///, \
-$(subst //,/, \
-$(subst file:///,file:!!!, \
-$(subst $(REPODIR),$(patsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
+$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1)))))))))
+$(1))))))
endef
# YaccTarget class
commit 5cabaf5a32188f24344f68fa48cbdc0a8b8cfb41
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Feb 9 17:54:00 2012 +0100
fdo#39491 more of unnecessary include paths
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index 793410f..a073c8c 100644
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,frm/res))
$(eval $(call gb_SrsTarget_set_include,frm/res,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/forms/source/inc) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,frm/res,\
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index b7c533b..53bea7a 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(WORKDIR)/oox/inc/ \
))
$(eval $(call gb_Library_add_api,scfilt,\
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 8c5e1ac..99c0708 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/ana
$(eval $(call gb_Library_set_include,analysis,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
-I$(realpath $(WORKDIR)/UnoApiHeaders/offapi) \
))
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 6366dcd..b09fd06 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
$(eval $(call gb_Library_set_include,date,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
-I$(realpath $(WORKDIR)/UnoApiHeaders/offapi) \
))
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index ba9493a..806fa77 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,solver))
$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver))
-$(eval $(call gb_Library_set_include,solver,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/sccomp/source/solver) \
-))
-
$(eval $(call gb_Library_add_api,solver,\
offapi \
udkapi \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 1b030bb..849d0c6 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -51,10 +51,8 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\
$(eval $(call gb_Library_set_include,sd,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/sd/inc) \
- -I$(realpath $(SRCDIR)/sd/sdi) \
-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
-I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
- -I$(WORKDIR)/inc/sd \
-I$(WORKDIR)/SdiTarget/sd/sdi \
))
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 957a9e9..b3e74ff 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,sdfilt))
$(eval $(call gb_Library_set_include,sdfilt,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/sd/inc) \
- -I$(WORKDIR)/oox/inc/ \
))
$(eval $(call gb_Library_add_defs,sdfilt,\
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index d197ef2..473f8c6 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
$(eval $(call gb_SrsTarget_set_include,sfx/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
-I$(realpath $(SRCDIR)/sfx2/source/dialog) \
-I$(realpath $(SRCDIR)/sfx2/source/inc) \
-I$(realpath $(SRCDIR)/sfx2/inc/) \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index f6597b5..cf7c580 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_set_include,sfx,\
-I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
-I$(realpath $(SRCDIR)/sfx2/source/inc) \
-I$(WORKDIR)/SdiTarget/sfx2/sdi \
- -I$(WORKDIR)/inc/ \
$$(INCLUDE) \
))
diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index 70edac2..d47b973 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
$(eval $(call gb_SrsTarget_set_include,svl/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,svl/res,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 33cf144..dee7a5f 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,fsstorage))
$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
$(eval $(call gb_Library_set_include,fsstorage,\
- -I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svl/inc) \
-I$(realpath $(SRCDIR)/svl/inc/svl) \
-I$(realpath $(SRCDIR)/svl/source/inc) \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 735c952..3eebca6 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,passwordcontainer))
$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
$(eval $(call gb_Library_set_include,passwordcontainer,\
- -I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svl/inc) \
-I$(realpath $(SRCDIR)/svl/inc/svl) \
-I$(realpath $(SRCDIR)/svl/source/inc) \
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index be34c69..615a09b 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/res))
$(eval $(call gb_SrsTarget_set_include,svt/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
))
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index c2672ba..760edee 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,bmp))
$(eval $(call gb_Executable_set_include,bmp,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 9b3edfa..712e81f 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,hatchwindowfactory,svtools/source/hat
$(eval $(call gb_Library_set_include,hatchwindowfactory,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
))
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fb294de..c07d01b 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_api,svt,\
$(eval $(call gb_Library_set_include,svt,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
-I$(realpath $(SRCDIR)/svtools/inc) \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 9951fb3..376bab5 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
$$(INCLUDE) \
- -I$(WORKDIR)/oox/inc/ \
))
$(eval $(call gb_Library_add_api,msword,\
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 49fb833..6c1556f 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,subsequenttest))
-$(eval $(call gb_Library_set_include,subsequenttest,\
- -I$(SRCDIR)/tools/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Library_add_defs,subsequenttest,\
-DOOO_DLLIMPLEMENTATION_TEST \
))
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 4275a1f..d590425 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -29,11 +29,6 @@ $(eval $(call gb_Library_Library,test))
$(eval $(call gb_Library_add_package_headers,test,test_inc))
-$(eval $(call gb_Library_set_include,test,\
- -I$(SRCDIR)/tools/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Library_add_defs,test,\
-DOOO_DLLIMPLEMENTATION_TEST \
))
diff --git a/wizards/AllLangResTarget_cal.mk b/wizards/AllLangResTarget_cal.mk
index 4f812bb..2a312f0 100644
--- a/wizards/AllLangResTarget_cal.mk
+++ b/wizards/AllLangResTarget_cal.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,cal/res))
$(eval $(call gb_SrsTarget_set_include,cal/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,cal/res,\
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
index f9e1ee1..dc596b5 100644
--- a/wizards/AllLangResTarget_dbw.mk
+++ b/wizards/AllLangResTarget_dbw.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbw/res))
$(eval $(call gb_SrsTarget_set_include,dbw/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,dbw/res,\
diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk
index d2ff342..a55d679 100644
--- a/wizards/AllLangResTarget_eur.mk
+++ b/wizards/AllLangResTarget_eur.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,eur/res))
$(eval $(call gb_SrsTarget_set_include,eur/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,eur/res,\
diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk
index afbc449..7a25f06 100644
--- a/wizards/AllLangResTarget_imp.mk
+++ b/wizards/AllLangResTarget_imp.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,imp/res))
$(eval $(call gb_SrsTarget_set_include,imp/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,imp/res,\
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
index d2326fb..5546ece 100644
--- a/wizards/AllLangResTarget_tpl.mk
+++ b/wizards/AllLangResTarget_tpl.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,tpl/res))
$(eval $(call gb_SrsTarget_set_include,tpl/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,tpl/res,\
diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk
index a81dcb0..c64f40f 100644
--- a/wizards/AllLangResTarget_wwz.mk
+++ b/wizards/AllLangResTarget_wwz.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,wwz/res))
$(eval $(call gb_SrsTarget_set_include,wwz/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,wwz/res,\
diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk
index 8566dc9..e489618 100644
--- a/wizards/AllLangResTarget_wzi.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
$(eval $(call gb_SrsTarget_set_include,wzi/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,wzi/res,\
commit 19b33ca42f1ce38a2e58070f962f37ecae58be0d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Feb 9 17:53:05 2012 +0100
fdo#39491 remove a few nonexistent include paths from SOLARINC
diff --git a/configure.in b/configure.in
index 927326e..5417c22 100644
--- a/configure.in
+++ b/configure.in
@@ -2975,6 +2975,7 @@ linux-androideabi*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
+ SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH"
;;
mingw*)
@@ -3000,7 +3001,7 @@ mingw*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32"
+ SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 -I$SRC_ROOT/solenv/inc/$OUTPATH"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
;;
@@ -3112,7 +3113,7 @@ esac
INPATH="${OUTPATH}${PROEXT}"
OUTDIR="$SRC_ROOT/solver/$INPATH"
-SOLARINC="-I. -I$SRC_ROOT/solver/$INPATH/inc/stl -I$SRC_ROOT/solver/$INPATH/inc/external -I$SRC_ROOT/solver/$INPATH/inc -I$SRC_ROOT/solenv/inc/$OUTPATH -I$SRC_ROOT/solenv/inc -I$SRC_ROOT/res $SOLARINC"
+SOLARINC="-I. -I$SRC_ROOT/solver/$INPATH/inc/external -I$SRC_ROOT/solver/$INPATH/inc -I$SRC_ROOT/solenv/inc $SOLARINC"
WORKDIR="$SRC_ROOT/workdir/$INPATH"
AC_SUBST(COM)
AC_SUBST(CPU)
commit 12bf03351ea38fb2d2eb5e184cd455d2d019fe1a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Jan 21 02:55:27 2012 +0100
fdo#39491 remove nonexistent include paths
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 7f5220b..03e30d9 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -32,11 +32,6 @@ $(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
-$(eval $(call gb_Library_set_include,animcore,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/animcore/source/animcore) \
-))
-
$(eval $(call gb_Library_add_api,animcore,\
offapi \
udkapi \
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index bc55447..4a743c1 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,fwe))
$(eval $(call gb_Library_set_include,fwe,\
-I$(realpath $(SRCDIR)/framework/source/inc) \
-I$(realpath $(SRCDIR)/framework/inc) \
- -I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
))
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 017116a..ac1f983 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_api,fwi,\
$(eval $(call gb_Library_set_include,fwi,\
-I$(realpath $(SRCDIR)/framework/source/inc) \
-I$(realpath $(SRCDIR)/framework/inc) \
- -I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
))
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 3d29ed1..0a16803 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
$(eval $(call gb_Library_set_include,fwk,\
-I$(realpath $(SRCDIR)/framework/source/inc) \
-I$(realpath $(SRCDIR)/framework/inc) \
- -I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
))
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index eea9ef1..175aab9 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
$(eval $(call gb_Library_set_include,fwl,\
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(realpath $(SRCDIR)/framework/source/inc) \
- -I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
))
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index 520302e..949aba4 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
$(eval $(call gb_Library_set_include,fwm,\
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(realpath $(SRCDIR)/framework/source/inc) \
- -I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
))
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 877d4d8..f767460 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/reportdesign \
-I$(SRCDIR)/reportdesign/source/ui/inc \
-I$(SRCDIR)/reportdesign/inc \
))
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 5722899..1a0d187 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sc/res))
$(eval $(call gb_SrsTarget_set_include,sc/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/sc \
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/source/ui/navipi) \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 75043f7..351386d 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,sc,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/SdiTarget/sc/sdi \
- -I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
))
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 3088e75..1ccfab8 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_set_componentfile,scd,sc/util/scd))
$(eval $(call gb_Library_set_include,scd,\
-I$(realpath $(SRCDIR)/sc/inc) \
- -I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
))
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index bd5bf4c..b7c533b 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(realpath $(SRCDIR)/sc/source/filter/inc) \
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
- -I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
-I$(WORKDIR)/oox/inc/ \
))
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c024024..1530aac 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_set_include,scui,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/SdiTarget/sc/sdi \
- -I$(WORKDIR)/Misc/sc \
$$(INCLUDE) \
))
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 30b77a1..60beaf3 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\
-I$(realpath $(SRCDIR)/sc/source/filter/inc) \
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
- -I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
))
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 478b4b6..33cf144 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,fsstorage))
$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
$(eval $(call gb_Library_set_include,fsstorage,\
- -I$(WORKDIR)/inc/svl \
-I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svl/inc) \
-I$(realpath $(SRCDIR)/svl/inc/svl) \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index b7e6b7e..735c952 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,passwordcontainer))
$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
$(eval $(call gb_Library_set_include,passwordcontainer,\
- -I$(WORKDIR)/inc/svl \
-I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svl/inc) \
-I$(realpath $(SRCDIR)/svl/inc/svl) \
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index fe0cd55..c2672ba 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,bmp))
$(eval $(call gb_Executable_set_include,bmp,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index ce19c28..9b3edfa 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,hatchwindowfactory,svtools/source/hat
$(eval $(call gb_Library_set_include,hatchwindowfactory,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
))
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 19253fa..fb294de 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_api,svt,\
$(eval $(call gb_Library_set_include,svt,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 8380556..67bebd2 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sw/res))
$(eval $(call gb_SrsTarget_set_include,sw/res,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/sw \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/core/undo) \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 8e61cab..9951fb3 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
- -I$(WORKDIR)/inc/sw/sdi \
- -I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
-I$(WORKDIR)/oox/inc/ \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index a33bb5f..fc51422 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,sw,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/SdiTarget/sw/sdi \
- -I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
))
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 3812f97..c7d8f46 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_Library_set_componentfile,swd,sw/util/swd))
$(eval $(call gb_Library_set_include,swd,\
$$(INCLUDE) \
- -I$(WORKDIR)/inc/sw/sdi \
- -I$(WORKDIR)/inc/sw \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index ce6f988..fe1c254 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,swui,\
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(WORKDIR)/SdiTarget/sw/sdi \
- -I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
))
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index d370362..8b65516 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,vbaswobj,\
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
- -I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
))
commit 4b30ec9def591ba77d5ec9ac09ded1e6782ede8d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Jan 21 01:52:59 2012 +0100
fdo#39491 -I$(OUTDIR)/inc is set in SOLARINC
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 2dc3abf..7f5220b 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/a
$(eval $(call gb_Library_set_include,animcore,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/animcore/source/animcore) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,animcore,\
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index e72a328..364bc42 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
-I$(realpath $(SRCDIR)/basegfx/inc) \
-I$(realpath $(SRCDIR)/basegfx/source/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
# Work around gcc bug 41847 present at least in
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index 0c9e657..8b80946 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -34,5 +34,4 @@ $(eval $(call gb_CppunitTest_set_include,basic_scanner,\
-I$(realpath $(SRCDIR)/basic/source/inc) \
-I$(realpath $(SRCDIR)/basic/inc) \
$$(INCLUDE) \
--I$(OUTDIR)/inc \
))
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index c1ca220..eb737ea 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
-I$(realpath $(SRCDIR)/chart2/source/controller/main) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(WORKDIR)/inc/chart2 \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,chart2/res,\
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index fbfbcb7..243e589 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,chartcontroller,\
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index 9781e9b..ef38846 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,chartmodel,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/chart2/source/model/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,chartmodel,\
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index b67f908..e1fd161 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,charttools))
$(eval $(call gb_Library_set_include,charttools,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,charttools,\
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index de52de2..3535a20 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,chartview,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/chart2/source/view/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,chartview,\
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 9d40d82..437824b 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,cui/res))
$(eval $(call gb_SrsTarget_set_include,cui/res,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/cui/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,cui/res,\
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6a5e683..516c68c 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,cui,cui/util/cui))
$(eval $(call gb_Library_set_include,cui,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/cui/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,cui,\
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index d3203e2..f0a8dde 100644
--- a/dbaccess/AllLangResTarget_adabasui.mk
+++ b/dbaccess/AllLangResTarget_adabasui.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui))
$(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/dbaccess/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index 8dc4beb..35929da 100644
--- a/dbaccess/AllLangResTarget_dba.mk
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index dcb6aa1..94f1811 100644
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))
$(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index f17c96c..bb67ab0 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbui))
$(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/dbaccess \
-I$(SRCDIR)/dbaccess/source/ui/inc \
-I$(SRCDIR)/dbaccess/source/ui/dlg \
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index dd38e99..15fe6dc 100644
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
-I$(WORKDIR)/inc/dbaccess \
-I$(realpath $(SRCDIR)/dbaccess/inc) \
-I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 4def9b3..bb5e244 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES))
$(eval $(call gb_Executable_set_include,odbcconfig,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/dbaccess/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,odbcconfig,\
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index 2f55466..de00e77 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,adabasui))
$(eval $(call gb_Library_set_include,adabasui,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,adabasui,\
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 4a93a97..e8342ea 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,dba,\
-I$(realpath $(SRCDIR)/dbaccess/inc) \
-I$(realpath $(SRCDIR)/dbaccess/source/inc) \
-I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,dba,\
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 68bf399..92d819c 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,dbaxml))
$(eval $(call gb_Library_set_include,dbaxml,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/dbaccess/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,dbaxml,\
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index f635bbc..b16bcf7 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_package_headers,dbmm,\
$(eval $(call gb_Library_set_include,dbmm,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/dbaccess/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,dbmm,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index b0deeea..9097874 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,dbu,\
-I$(realpath $(SRCDIR)/dbaccess/source/inc) \
-I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \
-I$(WORKDIR)/inc/dbaccess \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,dbu,\
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 23d5f5b..7961b1c 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,sdbt,\
-I$(realpath $(SRCDIR)/dbaccess/inc) \
-I$(realpath $(SRCDIR)/dbaccess/source/inc/) \
-I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,sdbt,\
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index d2934d7..de99829 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc))
$(eval $(call gb_Library_set_include,drawinglayer,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,drawinglayer,\
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 9af0e51..e42cae5 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
$(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,editeng_borderline,\
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 22c30bb..8137721 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_external,extensions_test_update,curl))
$(eval $(call gb_CppunitTest_set_include,extensions_test_update,\
$$(INCLUDE) \
-I$(SRCDIR)/extensions/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,extensions_test_update,\
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index 1ea8b34..6689f0f 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,fileacc))
$(eval $(call gb_Library_set_include,fileacc,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,fileacc,\
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index 12849a3..793410f 100644
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,frm/res))
$(eval $(call gb_SrsTarget_set_include,frm/res,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/forms/source/inc) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc \
))
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 226d002..f6558ef 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,frm,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/forms/source/inc) \
-I$(realpath $(SRCDIR)/forms/source/solar/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,frm,\
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 0830623..2d509fe 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res))
$(eval $(call gb_SrsTarget_set_include,formula/res,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/formula/source/core/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,formula/res,\
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
index 71d3e13..acf3711 100644
--- a/formula/AllLangResTarget_forui.mk
+++ b/formula/AllLangResTarget_forui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_SrsTarget_set_include,formula/ui,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/formula/inc) \
-I$(realpath $(SRCDIR)/formula/source/ui/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,formula/ui,\
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 4a70c43..8c2813a 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_package_headers,for,\
$(eval $(call gb_Library_set_include,for,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/formula/source/core/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,for,\
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index c46bd92..a07961a 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,forui,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/formula/inc) \
-I$(realpath $(SRCDIR)/formula/source/ui/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,forui,\
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 6b9474e..fd27382 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(realpath $(SRCDIR)/framework/inc/classes) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
@@ -55,7 +54,6 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(realpath $(SRCDIR)/framework/inc/services) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 8f3df32..bc55447 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,fwe,\
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/framework \
))
$(eval $(call gb_Library_add_defs,fwe,\
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 91b1621..017116a 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,fwi,\
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/framework \
))
$(eval $(call gb_Library_add_linked_libs,fwi,\
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 7d8d064..3d29ed1 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwk,\
-I$(realpath $(SRCDIR)/framework/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/framework \
))
$(eval $(call gb_Library_add_api,fwk,\
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 8f1e72f..eea9ef1 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwl,\
-I$(realpath $(SRCDIR)/framework/source/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/framework \
))
$(eval $(call gb_Library_add_api,fwl,\
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index cd88fb4..520302e 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwm,\
-I$(realpath $(SRCDIR)/framework/source/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/framework \
))
$(eval $(call gb_Library_add_api,fwm,\
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 540db59..841e199 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,hwpfilter_test_hwpfilter, \
$(eval $(call gb_CppunitTest_set_include,hwpfilter_test_hwpfilter,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,hwpfilter_test_hwpfilter,\
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 0fe2ee2..b91f209 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,svidl))
$(eval $(call gb_Executable_set_include,svidl,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/idl/inc) \
))
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 72f87d6..b84066f 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
$(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,lotuswordpro_test_lotuswordpro,\
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index af1e4b1..7e06d12 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,lwpft))
$(eval $(call gb_Library_set_include,lwpft,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,lwpft,\
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0171b4e..47fdf90 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_package_headers,oox,\
$(eval $(call gb_Library_set_include,oox,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(realpath $(SRCDIR)/oox/inc) \
))
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index b4081c3..7dfb7d9 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,spadmin.bin))
$(eval $(call gb_Executable_set_include,spadmin.bin,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 71e2116..cc687bd 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
$(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 18674e0..877d4d8 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/reportdesign \
-I$(SRCDIR)/reportdesign/source/ui/inc \
-I$(SRCDIR)/reportdesign/inc \
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 96f82fa..e052d0a 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,rpt,\
-I$(realpath $(SRCDIR)/reportdesign/inc) \
-I$(realpath $(SRCDIR)/reportdesign/source/inc) \
-I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,rpt,\
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 418e1c9..df1149f 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,rptui,\
-I$(realpath $(SRCDIR)/reportdesign/inc) \
-I$(realpath $(SRCDIR)/reportdesign/source/inc) \
-I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,rptui,\
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 56ba2fd..929311b 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,rptxml,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/reportdesign/inc) \
-I$(realpath $(SRCDIR)/reportdesign/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,rptxml,\
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index d201ca8..bdacb0b 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_databaserangeobj,\
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 01f8c41..b1e54b0 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_datapilotfieldobj,\
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 05bca55..5e14b91 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_datapilottableobj,\
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 259d308..26bcc7a 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index b8205ac..e983715 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_macros_test,\
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 948e84d..c9f49e6 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_namedrangeobj,\
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 6a4e968..cc24060 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_namedrangesobj,\
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index a72b09f..77d47bd 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_subsequent_filters_test,\
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index a002d67..5cb9762 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_tableautoformatfield,\
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 53f3337..e1f92c6 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_spreadsheetsobj,\
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index f3d5c02..2e24f4c 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sc_ucalc,\
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 97fb999..bd5bf4c 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
-I$(WORKDIR)/oox/inc/ \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,scfilt,\
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 235cabd..30b77a1 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
))
$(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 01486fa..f8711ab 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_set_include,sd/res,\
-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
-I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
-I$(WORKDIR)/inc/sd \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,sd/res,\
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 54d8310..12f3048 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
-I$(realpath $(SRCDIR)/sd/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sd_filters_test,\
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 8e56336..ee42c72 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\
-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
-I$(realpath $(SRCDIR)/sd/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sd_regression_test,\
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index d7233a2..bf01d0c 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_uimpress))
$(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/sd/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4f9fdc0..1b030bb 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_set_include,sd,\
-I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
-I$(WORKDIR)/inc/sd \
-I$(WORKDIR)/SdiTarget/sd/sdi \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,sd,\
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 84f9b09..94bdfec 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,sdd))
$(eval $(call gb_Library_set_include,sdd,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/sd/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,sdd,\
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 3316acc..957a9e9 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,sdfilt))
$(eval $(call gb_Library_set_include,sdfilt,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/sd/inc) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/oox/inc/ \
))
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index e57f462..da6212b 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,sdui,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/sd/inc) \
-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,sdui,\
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index f849ce8..d197ef2 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
$(eval $(call gb_SrsTarget_set_include,sfx/res,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc \
-I$(realpath $(SRCDIR)/sfx2/source/dialog) \
-I$(realpath $(SRCDIR)/sfx2/source/inc) \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 9b3b1be..f4b6783 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
$$(INCLUDE) \
-I$(SRCDIR)/sfx2/inc \
-I$(SRCDIR)/sfx2/inc/sfx2 \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,qstart_gtk,\
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index b8f5d37..f6597b5 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_set_include,sfx,\
-I$(WORKDIR)/SdiTarget/sfx2/sdi \
-I$(WORKDIR)/inc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,sfx,\
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 327d4d9..f23d763 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_add_package_headers,slideshow,sd_qa_unit))
$(eval $(call gb_CppunitTest_set_include,slideshow,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/slideshow/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_set_defs,slideshow,\
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index be96512..dbbe446 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_add_package_headers,demoshow,sd_qa_unit))
$(eval $(call gb_Executable_set_include,demoshow,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/slideshow/source/inc) \
- -I$(OUTDIR)/inc \
))
ifeq ($(strip $(VERBOSE)),TRUE)
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index fd1557f..96eef69 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,OGLTrans))
$(eval $(call gb_Library_set_include,OGLTrans,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
ifeq ($(strip $(VERBOSE)),TRUE)
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 187aae4..e00686b 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,slideshow))
$(eval $(call gb_Library_set_include,slideshow,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/slideshow/source/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,slideshow,\
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index 0536528..7403b5b 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sot_test_sot, \
$(eval $(call gb_CppunitTest_set_include,sot_test_sot,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sot_test_sot,\
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index c174a35..3c73abb 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,starmath_qa_cppunit))
$(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/starmath/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 3ccf552..fb35e91 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,sm,\
-I$(realpath $(SRCDIR)/starmath/inc) \
-I$(WORKDIR)/SdiTarget/starmath/sdi \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,sm,\
@@ -102,7 +101,6 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
-I$(realpath $(SRCDIR)/starmath/inc) \
-I$(realpath $(SRCDIR)/starmath/sdi) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
# vim: set noet sw=4 ts=4:
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index 5c38e41..ae2c57f 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -52,6 +52,5 @@ $(eval $(call gb_CppunitTest_set_include,svl_lngmisc,\
-I$(realpath $(SRCDIR)/svl/source/inc) \
-I$(realpath $(SRCDIR)/svl/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 2247c9a..478b4b6 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,fsstorage,\
-I$(realpath $(SRCDIR)/svl/inc) \
-I$(realpath $(SRCDIR)/svl/inc/svl) \
-I$(realpath $(SRCDIR)/svl/source/inc) \
- -I$(OUTDIR)/inc \
$$(INCLUDE) \
))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 6b577b6..b7e6b7e 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
-I$(realpath $(SRCDIR)/svl/inc) \
-I$(realpath $(SRCDIR)/svl/inc/svl) \
-I$(realpath $(SRCDIR)/svl/source/inc) \
- -I$(OUTDIR)/inc \
$$(INCLUDE) \
))
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 8ca769e..56f3510 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,svtools_filters_test, \
$(eval $(call gb_CppunitTest_set_include,svtools_filters_test,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,svtools_filters_test,\
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 0d80e92..fe0cd55 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_set_include,bmp,\
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
- -I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 49ef1e6..d9e003b 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,bmpsum))
$(eval $(call gb_Executable_set_include,bmpsum,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
))
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 48c2ca9..4a89156 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,g2g))
$(eval $(call gb_Executable_set_include,g2g,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
))
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 1c35a08..ce19c28 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -34,9 +34,7 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
- -I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,hatchwindowfactory,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 120e077..19253fa 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_set_include,svt,\
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
- -I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
-I$(realpath $(SRCDIR)/svtools/inc) \
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index c2d109f..1da1a01 100644
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
$(eval $(call gb_SrsTarget_set_include,svx/gal,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(realpath $(SRCDIR)/svx/source/gallery2) \
-I$(realpath $(SRCDIR)/svx/inc/) \
))
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
index 63e03ff..c8f0e10 100644
--- a/svx/AllLangResTarget_ofa.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))
$(eval $(call gb_SrsTarget_set_include,svx/ofa,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(SRCDIR)/svx/inc/ \
))
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 50675cf..7d1370a 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
$(eval $(call gb_SrsTarget_set_include,svx/res,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/svx \
-I$(realpath $(SRCDIR)/svx/source/inc) \
-I$(realpath $(SRCDIR)/svx/source/dialog) \
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
index 238745f..65cf7ad 100644
--- a/svx/AllLangResTarget_textconversiondlgs.mk
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs))
$(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(SRCDIR)/svx/inc/ \
))
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 5bb50ab..8380556 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sw/res))
$(eval $(call gb_SrsTarget_set_include,sw/res,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/sw \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index ce85a4c..a06c8a8 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sw_filters_test,\
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 0a2a81d..a2f4c4e 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sw_macros_test,\
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index d5056ed..101bf65 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -79,7 +79,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_swdoc_test,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_CppunitTest_add_api,sw_swdoc_test,\
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index f626351..8e61cab 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
-I$(WORKDIR)/oox/inc/ \
- -I$(OUTDIR)/inc/sw \
))
$(eval $(call gb_Library_add_api,msword,\
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 40e70f3..a33bb5f 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,sw,\
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,sw,\
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index fd35e42..d370362 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,vbaswobj,\
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
))
$(eval $(call gb_Library_add_api,vbaswobj,\
diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk
index 97112cd..0468c49 100644
--- a/tools/Executable_bestreversemap.mk
+++ b/tools/Executable_bestreversemap.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Executable_Executable,bestreversemap))
$(eval $(call gb_Executable_set_include,bestreversemap,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/ \
))
$(eval $(call gb_Executable_add_linked_libs,bestreversemap,\
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 5454edf..98fad08 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,utl,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
))
# add any additional definitions to be set for compilation here
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 074f9cc..bae9265 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,desktop_detector,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 424197a..e6da489 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
$(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \
-I$(WORKDIR)/CustomTarget/vcl/generic/fontmanager \
))
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index e29266d..4be0bfc 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,vclplug_gen,\
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 657844d..b5a6eb0 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
-I$(SRCDIR)/vcl/unx \
-I$(SRCDIR)/vcl/unx/gtk/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,vclplug_gtk,\
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index ca50535..0be8ef9 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
-I$(SRCDIR)/vcl/unx \
-I$(SRCDIR)/vcl/unx/gtk3/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 260dce2..d1c6f6d 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_set_include,vclplug_kde,\
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 6828936..34d2892 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
-I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \
))
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 4f87c79..f96109d 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_cxxflags,vclplug_svp,\
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 1de8e9e..7803962 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_StaticLibrary_set_include,vclmain,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_StaticLibrary_add_api,vclmain,\
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index f04202c..f694d45 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(SRCDIR)/writerfilter/inc \
))
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 43f36b0..beff35f 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
-I$(WORKDIR)/CustomTarget/writerfilter/source \
-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
- -I$(OUTDIR)/inc \
))
include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index f4a1fe2..5cea549 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,ooxml,\
-I$(WORKDIR)/CustomTarget/writerfilter/source \
-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,ooxml,\
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 8f999d6..fc29368 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
-I$(WORKDIR)/CustomTarget/writerfilter/source \
- -I$(OUTDIR)/inc \
))
include $(SRCDIR)/writerfilter/debug_setup.mk
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 1afdd27..9962632 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,rtftok,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
-I$(WORKDIR)/CustomTarget/writerfilter/source \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,rtftok,\
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 3f4c3bd..c6e0634 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,writerfilter_uno))
$(eval $(call gb_Library_set_include,writerfilter_uno,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/writerfilter/inc) \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_defs,writerfilter_uno,\
commit e8a28be0dd3eb471d1d063c68b5bc163df65e182
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Jan 21 00:46:29 2012 +0100
move this include path to RepositoryExternal.mk
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b607ac8..d762282 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -120,6 +120,11 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_jpeg
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/external/jpeg \
+)
+
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
jpeglib \
)
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index d987e59..120e077 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_add_api,svt,\
))
$(eval $(call gb_Library_set_include,svt,\
- -I$(OUTDIR)/inc/external/jpeg \
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
More information about the Libreoffice-commits
mailing list