diff options
| -rw-r--r-- | cppu/InternalUnoApi_cppu.mk | 2 | ||||
| -rw-r--r-- | cppuhelper/InternalUnoApi_cppuhelper.mk | 2 | ||||
| -rw-r--r-- | jurt/InternalUnoApi_test_urp.mk | 2 | ||||
| -rw-r--r-- | odk/CustomTarget_autodoc.mk | 2 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 2 | ||||
| -rw-r--r-- | oovbaapi/UnoApi_oovbaapi.mk | 3 | ||||
| -rw-r--r-- | scaddins/InternalUnoApi_scaddins.mk | 3 | ||||
| -rw-r--r-- | testtools/InternalUnoApi_bridgetest.mk | 2 | ||||
| -rw-r--r-- | touch/InternalUnoApi_touch.mk | 2 | ||||
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 1 |
10 files changed, 11 insertions, 10 deletions
diff --git a/cppu/InternalUnoApi_cppu.mk b/cppu/InternalUnoApi_cppu.mk index ec374b81dcaa..40e4a40111c7 100644 --- a/cppu/InternalUnoApi_cppu.mk +++ b/cppu/InternalUnoApi_cppu.mk @@ -32,7 +32,7 @@ $(eval $(call gb_InternalUnoApi_use_api,cppu,\ )) $(eval $(call gb_InternalUnoApi_set_include,cppu,\ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/udkapi \ $$(INCLUDE) \ )) diff --git a/cppuhelper/InternalUnoApi_cppuhelper.mk b/cppuhelper/InternalUnoApi_cppuhelper.mk index c61b5b07671b..5d8f18b0d6af 100644 --- a/cppuhelper/InternalUnoApi_cppuhelper.mk +++ b/cppuhelper/InternalUnoApi_cppuhelper.mk @@ -32,7 +32,7 @@ $(eval $(call gb_InternalUnoApi_use_api,cppuhelper,\ )) $(eval $(call gb_InternalUnoApi_set_include,cppuhelper,\ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/udkapi \ $$(INCLUDE) \ )) diff --git a/jurt/InternalUnoApi_test_urp.mk b/jurt/InternalUnoApi_test_urp.mk index 11d20cb8eb79..36c885e76e40 100644 --- a/jurt/InternalUnoApi_test_urp.mk +++ b/jurt/InternalUnoApi_test_urp.mk @@ -14,7 +14,7 @@ $(eval $(call gb_InternalUnoApi_use_api,test_urp,\ )) $(eval $(call gb_InternalUnoApi_set_include,test_urp,\ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/udkapi \ $$(INCLUDE) \ )) diff --git a/odk/CustomTarget_autodoc.mk b/odk/CustomTarget_autodoc.mk index 847ed9a67f5a..594f10689e07 100644 --- a/odk/CustomTarget_autodoc.mk +++ b/odk/CustomTarget_autodoc.mk @@ -19,7 +19,7 @@ $(odk_WORKDIR)/docs/common/ref/module-ix.html: $(SRCDIR)/odk/pack/copying/idl_ch $(call gb_Helper_execute,autodoc) -html $(dir $@) \ -dvgroot "http://wiki.services.openoffice.org/wiki" \ -name "LibreOffice $(PRODUCTVERSION) API" \ - -lg idl -dvgfile $< -t $(OUTDIR)/idl + -lg idl -dvgfile $< -t $(SRCDIR)/udkapi $(SRCDIR)/offapi # vim: set noet sw=4 ts=4: diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e5513f63f4ec..186e2458d067 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -25,8 +25,8 @@ $(eval $(call gb_UnoApi_use_api,offapi,\ $(eval $(call gb_UnoApi_set_include,offapi,\ $$(INCLUDE) \ + -I$(SRCDIR)/udkapi \ -I$(SRCDIR)/offapi \ - -I$(OUTDIR)/idl \ )) diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index 75431a77edce..4df023ba74f7 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/oovbaapi/UnoApi_oovbaapi.mk @@ -27,7 +27,8 @@ $(eval $(call gb_UnoApi_use_api,oovbaapi,\ $(eval $(call gb_UnoApi_set_include,oovbaapi,\ $$(INCLUDE) \ -I$(SRCDIR)/oovbaapi \ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/offapi \ + -I$(SRCDIR)/udkapi \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\ diff --git a/scaddins/InternalUnoApi_scaddins.mk b/scaddins/InternalUnoApi_scaddins.mk index da3e5ca81fc6..3d80b23ee847 100644 --- a/scaddins/InternalUnoApi_scaddins.mk +++ b/scaddins/InternalUnoApi_scaddins.mk @@ -38,7 +38,8 @@ $(eval $(call gb_InternalUnoApi_define_api_dependencies,scaddins,offapi,\ $(eval $(call gb_InternalUnoApi_set_include,scaddins,\ -I$(SRCDIR)/scaddins/idl \ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/offapi \ + -I$(SRCDIR)/udkapi \ $$(INCLUDE) \ )) diff --git a/testtools/InternalUnoApi_bridgetest.mk b/testtools/InternalUnoApi_bridgetest.mk index de540e667123..7891b7760abc 100644 --- a/testtools/InternalUnoApi_bridgetest.mk +++ b/testtools/InternalUnoApi_bridgetest.mk @@ -31,7 +31,7 @@ $(eval $(call gb_InternalUnoApi_use_api,bridgetest,\ )) $(eval $(call gb_InternalUnoApi_set_include,bridgetest,\ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/udkapi \ $$(INCLUDE) \ )) diff --git a/touch/InternalUnoApi_touch.mk b/touch/InternalUnoApi_touch.mk index b74af1a4cb91..f2e9ea5a8a92 100644 --- a/touch/InternalUnoApi_touch.mk +++ b/touch/InternalUnoApi_touch.mk @@ -19,7 +19,7 @@ $(eval $(call gb_InternalUnoApi_define_api_dependencies,touch, \ $(eval $(call gb_InternalUnoApi_set_include,touch,\ -I$(SRCDIR)/touch/idl \ - -I$(OUTDIR)/idl \ + -I$(SRCDIR)/udkapi \ $$(INCLUDE) \ )) diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index c4c4eb2b5b60..a226b4271817 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -31,7 +31,6 @@ $(eval $(call gb_UnoApi_UnoApi,udkapi)) $(eval $(call gb_UnoApi_set_include,udkapi,\ $$(INCLUDE) \ -I$(SRCDIR)/udkapi \ - -I$(OUTDIR)/idl \ )) |