diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2019-06-22 12:34:48 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2019-09-23 10:47:25 +0200 |
commit | 42af04bf2493508b481b3d6a32c71bd03fa7191b (patch) | |
tree | b5e650d9d7b5b052bf7863434bf5c3668c4478c5 | |
parent | e2372c4bef2180ab8cbb04128accf6ab40654448 (diff) |
do not require $(SRCDIR) in every gb_Library_set_precompiled_header
Change-Id: I7b3a22584bb2e4d501f509ffcd80929feed23a4c
Reviewed-on: https://gerrit.libreoffice.org/79360
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
87 files changed, 87 insertions, 87 deletions
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 71acc97315aa..c7ada7672ba9 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Library_set_include,acc,\ -I$(SRCDIR)/accessibility/source/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,acc,$(SRCDIR)/accessibility/inc/pch/precompiled_acc)) +$(eval $(call gb_Library_set_precompiled_header,acc,accessibility/inc/pch/precompiled_acc)) $(eval $(call gb_Library_use_external,acc,boost_headers)) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index d93c5974f28e..acd12b474160 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_custom_headers,basctl,\ officecfg/registry \ )) -$(eval $(call gb_Library_set_precompiled_header,basctl,$(SRCDIR)/basctl/inc/pch/precompiled_basctl)) +$(eval $(call gb_Library_set_precompiled_header,basctl,basctl/inc/pch/precompiled_basctl)) $(eval $(call gb_Library_use_sdk_api,basctl)) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 8ba2fb7cb32c..8359969ae80c 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,basegfx)) $(eval $(call gb_Library_use_external,basegfx,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,basegfx,$(SRCDIR)/basegfx/inc/pch/precompiled_basegfx)) +$(eval $(call gb_Library_set_precompiled_header,basegfx,basegfx/inc/pch/precompiled_basegfx)) $(eval $(call gb_Library_use_sdk_api,basegfx)) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index c1b47e27daa6..6a27b15ed54d 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,sb,\ -I$(SRCDIR)/basic/source/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,sb,$(SRCDIR)/basic/inc/pch/precompiled_sb)) +$(eval $(call gb_Library_set_precompiled_header,sb,basic/inc/pch/precompiled_sb)) $(eval $(call gb_Library_use_external,sb,boost_headers)) diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 02c8bcb75774..677d4e7e5607 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\ -I$(SRCDIR)/chart2/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chartcontroller)) +$(eval $(call gb_Library_set_precompiled_header,chartcontroller,chart2/inc/pch/precompiled_chartcontroller)) $(eval $(call gb_Library_use_external,chartcontroller,boost_headers)) diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index e671110a753f..f42dfecd42fe 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_defs,chartcore,\ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ )) -$(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) +$(eval $(call gb_Library_set_precompiled_header,chartcore,chart2/inc/pch/precompiled_chartcore)) $(eval $(call gb_Library_use_externals,chartcore,\ boost_headers \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 5ed44c9cb358..6539844d3cf2 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,comphelper,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_precompiled_header,comphelper,$(SRCDIR)/comphelper/inc/pch/precompiled_comphelper)) +$(eval $(call gb_Library_set_precompiled_header,comphelper,comphelper/inc/pch/precompiled_comphelper)) $(eval $(call gb_Library_add_defs,comphelper,\ -DCOMPHELPER_DLLIMPLEMENTATION \ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index ae4467af01b2..19477b172308 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -8,7 +8,7 @@ $(eval $(call gb_Library_Library,configmgr)) -$(eval $(call gb_Library_set_precompiled_header,configmgr,$(SRCDIR)/configmgr/inc/pch/precompiled_configmgr)) +$(eval $(call gb_Library_set_precompiled_header,configmgr,configmgr/inc/pch/precompiled_configmgr)) $(eval $(call gb_Library_add_exception_objects,configmgr, \ configmgr/source/access \ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 10d1d4f5f38c..f371c2780f8c 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_set_include,ado,\ $(eval $(call gb_Library_use_external,ado,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,ado,$(SRCDIR)/connectivity/inc/pch/precompiled_ado)) +$(eval $(call gb_Library_set_precompiled_header,ado,connectivity/inc/pch/precompiled_ado)) $(eval $(call gb_Library_use_sdk_api,ado)) diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 5f734f8c2401..1741d01ee519 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,calc,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_set_precompiled_header,calc,$(SRCDIR)/connectivity/inc/pch/precompiled_calc)) +$(eval $(call gb_Library_set_precompiled_header,calc,connectivity/inc/pch/precompiled_calc)) $(eval $(call gb_Library_use_libraries,calc,\ cppu \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 8dcc9c43c50c..6f897391ebf9 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,dbase,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_set_precompiled_header,dbase,$(SRCDIR)/connectivity/inc/pch/precompiled_dbase)) +$(eval $(call gb_Library_set_precompiled_header,dbase,connectivity/inc/pch/precompiled_dbase)) $(eval $(call gb_Library_use_libraries,dbase,\ cppu \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index 38b3cd197f01..d4c60675f855 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,dbpool2,\ -I$(SRCDIR)/connectivity/source/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,dbpool2,$(SRCDIR)/connectivity/inc/pch/precompiled_dbpool2)) +$(eval $(call gb_Library_set_precompiled_header,dbpool2,connectivity/inc/pch/precompiled_dbpool2)) $(eval $(call gb_Library_use_sdk_api,dbpool2)) diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 79723037a5db..d91cdfc553fe 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,dbtools,\ -I$(SRCDIR)/connectivity/source/inc \ )) -#$(eval $(call gb_Library_set_precompiled_header,dbtools,$(SRCDIR)/connectivity/inc/pch/precompiled_dbtools)) +#$(eval $(call gb_Library_set_precompiled_header,dbtools,connectivity/inc/pch/precompiled_dbtools)) $(eval $(call gb_Library_use_external,dbtools,boost_headers)) diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index e6ff6bcfa29d..2ed564a2e7f7 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,file,\ -DOOO_DLLIMPLEMENTATION_FILE \ )) -$(eval $(call gb_Library_set_precompiled_header,file,$(SRCDIR)/connectivity/inc/pch/precompiled_file)) +$(eval $(call gb_Library_set_precompiled_header,file,connectivity/inc/pch/precompiled_file)) $(eval $(call gb_Library_set_include,file,\ $$(INCLUDE) \ diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk index e7aae8595604..2c6eb559b033 100644 --- a/connectivity/Library_firebird_sdbc.mk +++ b/connectivity/Library_firebird_sdbc.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,firebird_sdbc,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_set_precompiled_header,firebird_sdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_firebird_sdbc)) +$(eval $(call gb_Library_set_precompiled_header,firebird_sdbc,connectivity/inc/pch/precompiled_firebird_sdbc)) $(eval $(call gb_Library_use_libraries,firebird_sdbc, \ comphelper \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index dd986cd6e6d8..c37b6ae5ed37 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_external,flat,boost_headers)) $(eval $(call gb_Library_use_sdk_api,flat)) -$(eval $(call gb_Library_set_precompiled_header,flat,$(SRCDIR)/connectivity/inc/pch/precompiled_flat)) +$(eval $(call gb_Library_set_precompiled_header,flat,connectivity/inc/pch/precompiled_flat)) $(eval $(call gb_Library_set_include,flat,\ $$(INCLUDE) \ diff --git a/connectivity/Library_mysql_jdbc.mk b/connectivity/Library_mysql_jdbc.mk index 3e92a7e19622..0a4c60e60196 100644 --- a/connectivity/Library_mysql_jdbc.mk +++ b/connectivity/Library_mysql_jdbc.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,mysql_jdbc,\ -I$(SRCDIR)/connectivity/source/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_mysql)) +$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,connectivity/inc/pch/precompiled_mysql)) $(eval $(call gb_Library_use_libraries,mysql_jdbc,\ cppu \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 179b6443939c..1d1c82cf174c 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_add_defs,odbc,\ -DSQL_WCHART_CONVERT) \ )) -$(eval $(call gb_Library_set_precompiled_header,odbc,$(SRCDIR)/connectivity/inc/pch/precompiled_odbc)) +$(eval $(call gb_Library_set_precompiled_header,odbc,connectivity/inc/pch/precompiled_odbc)) $(eval $(call gb_Library_use_externals,odbc,\ boost_headers \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 6927bbe457e2..c372f3f0c6f6 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\ -DPQ_SDBC_MICRO=2 \ )) -$(eval $(call gb_Library_set_precompiled_header,postgresql-sdbc-impl,$(SRCDIR)/connectivity/inc/pch/precompiled_postgresql-sdbc-impl)) +$(eval $(call gb_Library_set_precompiled_header,postgresql-sdbc-impl,connectivity/inc/pch/precompiled_postgresql-sdbc-impl)) $(eval $(call gb_Library_use_sdk_api,postgresql-sdbc-impl)) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 6aa698d5e9b7..92f8341f12fb 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\ -DCPPCANVAS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/pch/precompiled_cppcanvas)) +$(eval $(call gb_Library_set_precompiled_header,cppcanvas,cppcanvas/inc/pch/precompiled_cppcanvas)) $(eval $(call gb_Library_use_external,cppcanvas,boost_headers)) diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 9d05bf8c5529..67413f711cd2 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\ -DCPPUHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,cppuhelper,$(SRCDIR)/cppuhelper/inc/pch/precompiled_cppuhelper)) +$(eval $(call gb_Library_set_precompiled_header,cppuhelper,cppuhelper/inc/pch/precompiled_cppuhelper)) $(eval $(call gb_Library_use_libraries,cppuhelper,\ cppu \ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index f770cb08158a..8a2bf42d79c1 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,cui,\ -I$(SRCDIR)/cui/source/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precompiled_cui)) +$(eval $(call gb_Library_set_precompiled_header,cui,cui/inc/pch/precompiled_cui)) $(eval $(call gb_Library_add_defs,cui,\ $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 126f3a77211d..0b3d18e37a99 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,dba,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_set_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dba)) +$(eval $(call gb_Library_set_precompiled_header,dba,dbaccess/inc/pch/precompiled_dba)) $(eval $(call gb_Library_add_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ diff --git a/dbaccess/Library_dbahsql.mk b/dbaccess/Library_dbahsql.mk index 4932fae41ec1..7929e9bd6a2b 100644 --- a/dbaccess/Library_dbahsql.mk +++ b/dbaccess/Library_dbahsql.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_externals,dbahsql,\ boost_date_time \ )) -$(eval $(call gb_Library_set_precompiled_header,dbahsql,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbahsql)) +$(eval $(call gb_Library_set_precompiled_header,dbahsql,dbaccess/inc/pch/precompiled_dbahsql)) $(eval $(call gb_Library_use_sdk_api,dbahsql)) diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 0bfcfe9b7e16..0b9cb7666bf2 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,dbaxml,\ $(eval $(call gb_Library_use_external,dbaxml,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaxml)) +$(eval $(call gb_Library_set_precompiled_header,dbaxml,dbaccess/inc/pch/precompiled_dbaxml)) $(eval $(call gb_Library_use_sdk_api,dbaxml)) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index fdf37e92044a..121584ef3426 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_set_precompiled_header,dbu,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbu)) +$(eval $(call gb_Library_set_precompiled_header,dbu,dbaccess/inc/pch/precompiled_dbu)) $(eval $(call gb_Library_use_custom_headers,dbu,\ officecfg/registry \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 7af89f68911e..6021be9d9751 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,sdbt,\ $(eval $(call gb_Library_use_external,sdbt,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,sdbt,$(SRCDIR)/dbaccess/inc/pch/precompiled_sdbt)) +$(eval $(call gb_Library_set_precompiled_header,sdbt,dbaccess/inc/pch/precompiled_sdbt)) $(eval $(call gb_Library_use_sdk_api,sdbt)) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 8095676d3d79..887e9eefa4ec 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,deployment,\ $(eval $(call gb_Library_use_external,deployment,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,deployment,$(SRCDIR)/desktop/inc/pch/precompiled_deployment)) +$(eval $(call gb_Library_set_precompiled_header,deployment,desktop/inc/pch/precompiled_deployment)) $(eval $(call gb_Library_use_sdk_api,deployment)) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index c7152bcfac2c..900406002ce6 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,deploymentgui,\ $(eval $(call gb_Library_use_external,deploymentgui,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,deploymentgui,$(SRCDIR)/desktop/inc/pch/precompiled_deploymentgui)) +$(eval $(call gb_Library_set_precompiled_header,deploymentgui,desktop/inc/pch/precompiled_deploymentgui)) $(eval $(call gb_Library_use_custom_headers,deploymentgui,\ officecfg/registry \ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 8624f47ac6e4..b7f4c09e1b98 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_defs,deploymentmisc,\ -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,deploymentmisc,$(SRCDIR)/desktop/inc/pch/precompiled_deploymentmisc)) +$(eval $(call gb_Library_set_precompiled_header,deploymentmisc,desktop/inc/pch/precompiled_deploymentmisc)) $(eval $(call gb_Library_use_libraries,deploymentmisc,\ comphelper \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index bc5f7df4e483..e7c56f4ee0b7 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\ $(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \ )) -$(eval $(call gb_Library_set_precompiled_header,sofficeapp,$(SRCDIR)/desktop/inc/pch/precompiled_sofficeapp)) +$(eval $(call gb_Library_set_precompiled_header,sofficeapp,desktop/inc/pch/precompiled_sofficeapp)) $(eval $(call gb_Library_use_libraries,sofficeapp,\ comphelper \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index e6ffa9c7af00..63f52c27fb09 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\ -DDRAWINGLAYER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,drawinglayer,$(SRCDIR)/drawinglayer/inc/pch/precompiled_drawinglayer)) +$(eval $(call gb_Library_set_precompiled_header,drawinglayer,drawinglayer/inc/pch/precompiled_drawinglayer)) $(eval $(call gb_Library_set_componentfile,drawinglayer,drawinglayer/drawinglayer)) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index b7c9964aab9f..1237954ad6e9 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,editeng,\ $(eval $(call gb_Library_use_custom_headers,editeng,editeng/generated)) -$(eval $(call gb_Library_set_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng)) +$(eval $(call gb_Library_set_precompiled_header,editeng,editeng/inc/pch/precompiled_editeng)) $(eval $(call gb_Library_add_defs,editeng,\ -DEDITENG_DLLIMPLEMENTATION \ diff --git a/emfio/Library_emfio.mk b/emfio/Library_emfio.mk index d1a0a29395c2..52fde14885b3 100644 --- a/emfio/Library_emfio.mk +++ b/emfio/Library_emfio.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_custom_headers,emfio,\ $(eval $(call gb_Library_use_external,emfio,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,emfio,$(SRCDIR)/emfio/inc/pch/precompiled_emfio)) +$(eval $(call gb_Library_set_precompiled_header,emfio,emfio/inc/pch/precompiled_emfio)) $(eval $(call gb_Library_use_sdk_api,emfio)) diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk index e74a3722146d..ebcd16607c59 100644 --- a/external/libcmis/StaticLibrary_libcmis.mk +++ b/external/libcmis/StaticLibrary_libcmis.mk @@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libcmis)) $(eval $(call gb_StaticLibrary_set_warnings_disabled,libcmis)) -$(eval $(call gb_StaticLibrary_set_precompiled_header,libcmis,$(SRCDIR)/external/libcmis/inc/pch/precompiled_libcmis)) +$(eval $(call gb_StaticLibrary_set_precompiled_header,libcmis,external/libcmis/inc/pch/precompiled_libcmis)) ifeq ($(COM_IS_CLANG),TRUE) # Avoid narrowing conversion error (even though the option is technically a warning) diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk index 4aa8019d9611..cbbe08458410 100644 --- a/external/libetonyek/Library_etonyek.mk +++ b/external/libetonyek/Library_etonyek.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_use_externals,etonyek,\ $(eval $(call gb_Library_set_warnings_disabled,etonyek)) -$(eval $(call gb_Library_set_precompiled_header,etonyek,$(SRCDIR)/external/libetonyek/inc/pch/precompiled_etonyek)) +$(eval $(call gb_Library_set_precompiled_header,etonyek,external/libetonyek/inc/pch/precompiled_etonyek)) $(eval $(call gb_Library_set_include,etonyek,\ -I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \ diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index 0dc4e47d60c0..fc874fcb5e45 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_externals,mwaw,\ $(eval $(call gb_Library_set_warnings_disabled,mwaw)) -$(eval $(call gb_Library_set_precompiled_header,mwaw,$(SRCDIR)/external/libmwaw/inc/pch/precompiled_mwaw)) +$(eval $(call gb_Library_set_precompiled_header,mwaw,external/libmwaw/inc/pch/precompiled_mwaw)) $(eval $(call gb_Library_set_include,mwaw,\ -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \ diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 90a7f1157e4b..e6750cc822b9 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Library_use_unpacked,pdfium,pdfium)) $(eval $(call gb_Library_set_warnings_disabled,pdfium)) -$(eval $(call gb_Library_set_precompiled_header,pdfium,$(SRCDIR)/external/pdfium/inc/pch/precompiled_pdfium)) +$(eval $(call gb_Library_set_precompiled_header,pdfium,external/pdfium/inc/pch/precompiled_pdfium)) $(eval $(call gb_Library_set_include,pdfium,\ -I$(call gb_UnpackedTarball_get_dir,pdfium) \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index b27b99fa48dd..834a2a4eb91f 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,frm,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_set_precompiled_header,frm,$(SRCDIR)/forms/inc/pch/precompiled_frm)) +$(eval $(call gb_Library_set_precompiled_header,frm,forms/inc/pch/precompiled_frm)) $(eval $(call gb_Library_use_api,frm,\ offapi \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index bff052f499ad..8b56a463564d 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_use_sdk_api,fwe)) $(eval $(call gb_Library_use_external,fwe,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,fwe,$(SRCDIR)/framework/inc/pch/precompiled_fwe)) +$(eval $(call gb_Library_set_precompiled_header,fwe,framework/inc/pch/precompiled_fwe)) $(eval $(call gb_Library_use_libraries,fwe,\ comphelper \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index c19ddc866cde..536a6e5226c4 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,fwi,\ $(eval $(call gb_Library_use_external,fwi,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,fwi,$(SRCDIR)/framework/inc/pch/precompiled_fwi)) +$(eval $(call gb_Library_set_precompiled_header,fwi,framework/inc/pch/precompiled_fwi)) $(eval $(call gb_Library_use_libraries,fwi,\ comphelper \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 6d1f124f2f5a..665df00be044 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,fwk,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_fwk)) +$(eval $(call gb_Library_set_precompiled_header,fwk,framework/inc/pch/precompiled_fwk)) $(eval $(call gb_Library_use_external,fwk,boost_headers)) diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 58e2864c4296..a7252f5cb4d3 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,fwl,\ $(eval $(call gb_Library_use_external,fwl,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,fwl,$(SRCDIR)/framework/inc/pch/precompiled_fwl)) +$(eval $(call gb_Library_set_precompiled_header,fwl,framework/inc/pch/precompiled_fwl)) $(eval $(call gb_Library_use_sdk_api,fwl)) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 216fbe754e6d..1f6ee38b691f 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_externals,hwp,\ zlib \ )) -$(eval $(call gb_Library_set_precompiled_header,hwp,$(SRCDIR)/hwpfilter/inc/pch/precompiled_hwp)) +$(eval $(call gb_Library_set_precompiled_header,hwp,hwpfilter/inc/pch/precompiled_hwp)) ifeq ($(OS),WNT) diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 073a573ccb53..f35568d3647b 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,lwpft, \ -I$(SRCDIR)/lotuswordpro/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,lwpft,$(SRCDIR)/lotuswordpro/inc/pch/precompiled_lwpft)) +$(eval $(call gb_Library_set_precompiled_header,lwpft,lotuswordpro/inc/pch/precompiled_lwpft)) $(eval $(call gb_Library_use_libraries,lwpft,\ comphelper \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index dbc54f9ff4fb..cce41174dcc7 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,oox)) -$(eval $(call gb_Library_set_precompiled_header,oox,$(SRCDIR)/oox/inc/pch/precompiled_oox)) +$(eval $(call gb_Library_set_precompiled_header,oox,oox/inc/pch/precompiled_oox)) $(eval $(call gb_Library_use_custom_headers,oox,oox/generated)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index d0df0201e59b..adca76fba2ed 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_add_defs,package2,\ -DDLLIMPLEMENTATION_PACKAGE \ )) -$(eval $(call gb_Library_set_precompiled_header,package2,$(SRCDIR)/package/inc/pch/precompiled_package2)) +$(eval $(call gb_Library_set_precompiled_header,package2,package/inc/pch/precompiled_package2)) $(eval $(call gb_Library_use_libraries,package2,\ comphelper \ diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index b6498b8c128f..0d894e5d931b 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,xstor,\ -I$(SRCDIR)/package/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,xstor,$(SRCDIR)/package/inc/pch/precompiled_xstor)) +$(eval $(call gb_Library_set_precompiled_header,xstor,package/inc/pch/precompiled_xstor)) $(eval $(call gb_Library_use_sdk_api,xstor)) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index dec0903992d0..e56d4d8fa76f 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_add_defs,rpt,\ $(eval $(call gb_Library_use_external,rpt,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,rpt,$(SRCDIR)/reportdesign/inc/pch/precompiled_rpt)) +$(eval $(call gb_Library_set_precompiled_header,rpt,reportdesign/inc/pch/precompiled_rpt)) $(eval $(call gb_Library_use_sdk_api,rpt)) diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index eef0ce6a36e6..9397cec20e69 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,rptui,\ $(eval $(call gb_Library_use_external,rptui,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptui)) +$(eval $(call gb_Library_set_precompiled_header,rptui,reportdesign/inc/pch/precompiled_rptui)) $(eval $(call gb_Library_use_sdk_api,rptui)) diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index af68c0f60511..244815408fae 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,rptxml,\ $(eval $(call gb_Library_use_external,rptxml,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,rptxml,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptxml)) +$(eval $(call gb_Library_set_precompiled_header,rptxml,reportdesign/inc/pch/precompiled_rptxml)) $(eval $(call gb_Library_use_sdk_api,rptxml)) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 6b3931dc4727..e84ed0aaf1b5 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Library_Library,sal)) $(eval $(call gb_Library_set_soversion_script,sal,$(SRCDIR)/sal/util/sal.map)) -$(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal)) +$(eval $(call gb_Library_set_precompiled_header,sal,sal/inc/pch/precompiled_sal)) $(eval $(call gb_Library_set_include,sal,\ $$(INCLUDE) \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 91a29e021a49..d594ca110f6d 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_sdi_headers,sc,sc/sdi/scslots)) $(eval $(call gb_Library_set_componentfile,sc,sc/util/sc)) -$(eval $(call gb_Library_set_precompiled_header,sc,$(SRCDIR)/sc/inc/pch/precompiled_sc)) +$(eval $(call gb_Library_set_precompiled_header,sc,sc/inc/pch/precompiled_sc)) $(eval $(call gb_Library_set_include,sc,\ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 4766ed02f096..d7da0cd95f44 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_set_include,scfilt,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_precompiled_header,scfilt,$(SRCDIR)/sc/inc/pch/precompiled_scfilt)) +$(eval $(call gb_Library_set_precompiled_header,scfilt,sc/inc/pch/precompiled_scfilt)) $(eval $(call gb_Library_use_api,scfilt,\ udkapi \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 7105f59e11db..a8c2097485b0 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_custom_headers,scui,\ officecfg/registry \ )) \ -$(eval $(call gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui)) +$(eval $(call gb_Library_set_precompiled_header,scui,sc/inc/pch/precompiled_scui)) $(eval $(call gb_Library_use_custom_headers,scui,\ officecfg/registry \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 082b254c88df..9fa0628d3d92 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,vbaobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_precompiled_header,vbaobj,$(SRCDIR)/sc/inc/pch/precompiled_vbaobj)) +$(eval $(call gb_Library_set_precompiled_header,vbaobj,sc/inc/pch/precompiled_vbaobj)) $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj)) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index d777ea177a5d..e8afd204c308 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,sd)) -$(eval $(call gb_Library_set_precompiled_header,sd,$(SRCDIR)/sd/inc/pch/precompiled_sd)) +$(eval $(call gb_Library_set_precompiled_header,sd,sd/inc/pch/precompiled_sd)) # runtime dependency for unit tests $(eval $(call gb_Library_use_package,sd,sd_xml)) diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 73abad77f94b..d3fb419a28be 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_custom_headers,sdui,\ officecfg/registry \ )) -$(eval $(call gb_Library_set_precompiled_header,sdui,$(SRCDIR)/sd/inc/pch/precompiled_sdui)) +$(eval $(call gb_Library_set_precompiled_header,sdui,sd/inc/pch/precompiled_sdui)) $(eval $(call gb_Library_use_external,sdui,boost_headers)) diff --git a/sdext/Library_PresentationMinimizer.mk b/sdext/Library_PresentationMinimizer.mk index 933877b16738..8e95a7526a12 100644 --- a/sdext/Library_PresentationMinimizer.mk +++ b/sdext/Library_PresentationMinimizer.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,PresentationMinimizer)) $(eval $(call gb_Library_set_componentfile,PresentationMinimizer,sdext/source/minimizer/minimizer)) -$(eval $(call gb_Library_set_precompiled_header,PresentationMinimizer,$(SRCDIR)/sdext/inc/pch/precompiled_PresentationMinimizer)) +$(eval $(call gb_Library_set_precompiled_header,PresentationMinimizer,sdext/inc/pch/precompiled_PresentationMinimizer)) $(eval $(call gb_Library_use_externals,PresentationMinimizer,\ boost_headers \ diff --git a/sdext/Library_PresenterScreen.mk b/sdext/Library_PresenterScreen.mk index 9ffeb9657b16..cd4d09531794 100644 --- a/sdext/Library_PresenterScreen.mk +++ b/sdext/Library_PresenterScreen.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,PresenterScreen)) $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter)) -$(eval $(call gb_Library_set_precompiled_header,PresenterScreen,$(SRCDIR)/sdext/inc/pch/precompiled_PresenterScreen)) +$(eval $(call gb_Library_set_precompiled_header,PresenterScreen,sdext/inc/pch/precompiled_PresenterScreen)) $(eval $(call gb_Library_use_externals,PresenterScreen,\ boost_headers \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 2973fd0421e2..5bd8cfca2720 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) -$(eval $(call gb_Library_set_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx)) +$(eval $(call gb_Library_set_precompiled_header,sfx,sfx2/inc/pch/precompiled_sfx)) $(eval $(call gb_Library_use_custom_headers,sfx,\ officecfg/registry \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 0b9583011115..ec3d65989bff 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Library_add_defs,slideshow,\ )) endif -$(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/inc/pch/precompiled_slideshow)) +$(eval $(call gb_Library_set_precompiled_header,slideshow,slideshow/inc/pch/precompiled_slideshow)) $(eval $(call gb_Library_use_externals,slideshow,\ boost_headers \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 476ee429da33..2d559c51263e 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1508,7 +1508,7 @@ endef # call gb_LinkTarget__set_precompiled_header_impl,linktarget,pchcxxfile,pchtarget,linktargetmakefilename define gb_LinkTarget__set_precompiled_header_impl $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3)) -$(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(2).cxx +$(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call gb_CxxObject_get_source,$(SRCDIR),$(2)) $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call gb_LinkTarget_get_headers_target,$(1)) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 78d8c973bd39..88f010d7a50e 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_add_defs,sot,\ -DSOT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precompiled_sot)) +$(eval $(call gb_Library_set_precompiled_header,sot,sot/inc/pch/precompiled_sot)) $(eval $(call gb_Library_set_include,sot,\ -I$(SRCDIR)/sot/inc \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 9848e103ac23..d4b22f4d6623 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) -$(eval $(call gb_Library_set_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_sm)) +$(eval $(call gb_Library_set_precompiled_header,sm,starmath/inc/pch/precompiled_sm)) $(eval $(call gb_Library_set_include,sm,\ -I$(SRCDIR)/starmath/inc \ diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk index 94f78b91e5ce..3a85da62d820 100644 --- a/svgio/Library_svgio.mk +++ b/svgio/Library_svgio.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,svgio,\ $(eval $(call gb_Library_use_external,svgio,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,svgio,$(SRCDIR)/svgio/inc/pch/precompiled_svgio)) +$(eval $(call gb_Library_set_precompiled_header,svgio,svgio/inc/pch/precompiled_svgio)) $(eval $(call gb_Library_use_sdk_api,svgio)) diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 64e2feb8f834..c49417d21512 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_use_custom_headers,svl,\ officecfg/registry \ )) -$(eval $(call gb_Library_set_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl)) +$(eval $(call gb_Library_set_precompiled_header,svl,svl/inc/pch/precompiled_svl)) $(eval $(call gb_Library_use_sdk_api,svl)) diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index ecffada72bb7..262e16e9f3d4 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,svt)) -$(eval $(call gb_Library_set_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svt)) +$(eval $(call gb_Library_set_precompiled_header,svt,svtools/inc/pch/precompiled_svt)) $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt)) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 6d5dadf386f3..bdbdda1f555c 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,svx,\ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) -$(eval $(call gb_Library_set_precompiled_header,svx,$(SRCDIR)/svx/inc/pch/precompiled_svx)) +$(eval $(call gb_Library_set_precompiled_header,svx,svx/inc/pch/precompiled_svx)) $(eval $(call gb_Library_use_libraries,svx,\ $(call gb_Helper_optional,AVMEDIA,avmedia) \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index aa5c744d7409..fe2a7469bfe5 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,svxcore,\ -I$(WORKDIR)/SdiTarget/svx/sdi \ )) -$(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/precompiled_svxcore)) +$(eval $(call gb_Library_set_precompiled_header,svxcore,svx/inc/pch/precompiled_svxcore)) #BOOST switch in customshapes #dialog: diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 457c7351a9bc..7433a839b303 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_custom_headers,msword,\ oox/generated \ )) -$(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword)) +$(eval $(call gb_Library_set_precompiled_header,msword,sw/inc/pch/precompiled_msword)) $(eval $(call gb_Library_set_include,msword,\ -I$(SRCDIR)/sw/source/filter/inc \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index e3a2f1b1177b..7cf93d55e36e 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) $(eval $(call gb_Library_set_componentfile,sw,sw/util/sw)) -$(eval $(call gb_Library_set_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) +$(eval $(call gb_Library_set_precompiled_header,sw,sw/inc/pch/precompiled_sw)) $(eval $(call gb_Library_set_include,sw,\ -I$(SRCDIR)/sw/source/core/inc \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 915d5ac09464..99f1dd20ae3d 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,swui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_precompiled_header,swui,$(SRCDIR)/sw/inc/pch/precompiled_swui)) +$(eval $(call gb_Library_set_precompiled_header,swui,sw/inc/pch/precompiled_swui)) $(eval $(call gb_Library_use_externals,swui,\ boost_headers \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 28d4a867b8b1..2b2a5bef6e7b 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,vbaswobj)) $(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj)) -$(eval $(call gb_Library_set_precompiled_header,vbaswobj,$(SRCDIR)/sw/inc/pch/precompiled_vbaswobj)) +$(eval $(call gb_Library_set_precompiled_header,vbaswobj,sw/inc/pch/precompiled_vbaswobj)) $(eval $(call gb_Library_set_include,vbaswobj,\ -I$(SRCDIR)/sw/source/uibase/inc \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 54f200e5dbb5..233e75db0050 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tl)) +$(eval $(call gb_Library_set_precompiled_header,tl,tools/inc/pch/precompiled_tl)) $(eval $(call gb_Library_add_defs,tl,\ -DTOOLS_DLLIMPLEMENTATION \ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 19fcd7cfce1c..cdc4b38f96ae 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,utl,$(SRCDIR)/unotools/inc/pch/precompiled_utl)) +$(eval $(call gb_Library_set_precompiled_header,utl,unotools/inc/pch/precompiled_utl)) $(eval $(call gb_Library_use_sdk_api,utl)) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index f6e5e5d7832f..1d2202aa8839 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,unoxml)) $(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml)) -$(eval $(call gb_Library_set_precompiled_header,unoxml,$(SRCDIR)/unoxml/inc/pch/precompiled_unoxml)) +$(eval $(call gb_Library_set_precompiled_header,unoxml,unoxml/inc/pch/precompiled_unoxml)) $(eval $(call gb_Library_use_sdk_api,unoxml)) diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 7ca8d9a0e984..f1dc84a4761c 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_custom_headers,uui,\ officecfg/registry \ )) -$(eval $(call gb_Library_set_precompiled_header,uui,$(SRCDIR)/uui/inc/pch/precompiled_uui)) +$(eval $(call gb_Library_set_precompiled_header,uui,uui/inc/pch/precompiled_uui)) $(eval $(call gb_Library_use_sdk_api,uui)) diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 0c66fa19aa04..c9424d6f2716 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms)) $(eval $(call gb_Library_use_external,msforms,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,msforms,$(SRCDIR)/vbahelper/inc/pch/precompiled_msforms)) +$(eval $(call gb_Library_set_precompiled_header,msforms,vbahelper/inc/pch/precompiled_msforms)) $(eval $(call gb_Library_use_api,msforms,\ udkapi \ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 7f1c7983707c..fe76b63f4690 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_add_defs,vbahelper,\ $(eval $(call gb_Library_use_external,vbahelper,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,vbahelper,$(SRCDIR)/vbahelper/inc/pch/precompiled_vbahelper)) +$(eval $(call gb_Library_set_precompiled_header,vbahelper,vbahelper/inc/pch/precompiled_vbahelper)) $(eval $(call gb_Library_use_api,vbahelper,\ udkapi \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0ebd4dd35c64..20227b699092 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -35,7 +35,7 @@ else $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) endif -$(eval $(call gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) +$(eval $(call gb_Library_set_precompiled_header,vcl,vcl/inc/pch/precompiled_vcl)) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index bf1393e2778f..c18e95f1b248 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Library_use_custom_headers,writerfilter,\ writerfilter/source \ )) -$(eval $(call gb_Library_set_precompiled_header,writerfilter,$(SRCDIR)/writerfilter/inc/pch/precompiled_writerfilter)) +$(eval $(call gb_Library_set_precompiled_header,writerfilter,writerfilter/inc/pch/precompiled_writerfilter)) $(eval $(call gb_Library_set_include,writerfilter,\ $$(INCLUDE) \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 0656f8ee2ab0..9cee6c131e83 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,xo)) $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) -$(eval $(call gb_Library_set_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xo)) +$(eval $(call gb_Library_set_precompiled_header,xo,xmloff/inc/pch/precompiled_xo)) $(eval $(call gb_Library_set_include,xo,\ -I$(SRCDIR)/xmloff/inc \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index be4766b6737b..a10776d81127 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_use_custom_headers,xof,\ xmloff/generated \ )) -$(eval $(call gb_Library_set_precompiled_header,xof,$(SRCDIR)/xmloff/inc/pch/precompiled_xof)) +$(eval $(call gb_Library_set_precompiled_header,xof,xmloff/inc/pch/precompiled_xof)) $(eval $(call gb_Library_use_external,xof,boost_headers)) diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index daa9ae4ba2ca..e72fb194b155 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_add_defs,xmlscript,\ -DXMLSCRIPT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,xmlscript,$(SRCDIR)/xmlscript/inc/pch/precompiled_xmlscript)) +$(eval $(call gb_Library_set_precompiled_header,xmlscript,xmlscript/inc/pch/precompiled_xmlscript)) $(eval $(call gb_Library_add_exception_objects,xmlscript,\ xmlscript/source/misc/unoservices \ diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 5a80e6e17591..038276c1725b 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_add_defs,xmlsecurity,\ $(eval $(call gb_Library_use_externals,xmlsecurity,boost_headers)) -$(eval $(call gb_Library_set_precompiled_header,xmlsecurity,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity)) +$(eval $(call gb_Library_set_precompiled_header,xmlsecurity,xmlsecurity/inc/pch/precompiled_xmlsecurity)) $(eval $(call gb_Library_use_sdk_api,xmlsecurity)) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index f067e14d85f2..bd2cb6abef20 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXSECXMLSEC_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec)) +$(eval $(call gb_Library_set_precompiled_header,xsec_xmlsec,xmlsecurity/inc/pch/precompiled_xsec_xmlsec)) $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ comphelper \ |