diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-27 11:49:38 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-27 11:49:38 -0600 |
| commit | 992757cc5ebfb1df42636b8d3269cdbc10fc4148 (patch) | |
| tree | d9b4da6f2e50d5444e3a7c68934fc6d4dd4ec43d | |
| parent | bc78ac68c2492e63a680f68b524c4a51179ea83e (diff) | |
remove pre-compiled header support in gbuild and gbuildified module
120 files changed, 2 insertions, 551 deletions
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk index e9ae6f1ef7d9..95cecc884c93 100644 --- a/automation/Executable_miniapp.mk +++ b/automation/Executable_miniapp.mk @@ -29,8 +29,6 @@ $(eval $(call gb_Executable_Executable,miniapp)) $(eval $(call gb_Executable_set_targettype_gui,miniapp,YES)) -$(eval $(call gb_Executable_add_precompiled_header,miniapp,automation/inc/pch/precompiled_automation.hxx)) - $(eval $(call gb_Executable_set_include,miniapp,\ $$(INCLUDE) \ -I$(SRCDIR)/automation/inc/pch \ diff --git a/automation/Executable_testtool.mk b/automation/Executable_testtool.mk index 0d782c7fb949..98ae557a7649 100644 --- a/automation/Executable_testtool.mk +++ b/automation/Executable_testtool.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Executable_add_package_headers,testtool,\ automation_testtool \ )) -$(eval $(call gb_Executable_add_precompiled_header,testtool,automation/inc/pch/precompiled_automation.hxx)) - $(eval $(call gb_Executable_set_include,testtool,\ $$(INCLUDE) \ -I$(call gb_CustomTarget_get_workdir,automation/source/testtool) \ diff --git a/automation/Library_communi.mk b/automation/Library_communi.mk index 263b8f1f22db..998069e58a87 100644 --- a/automation/Library_communi.mk +++ b/automation/Library_communi.mk @@ -29,8 +29,6 @@ $(eval $(call gb_Library_add_package_headers,communi,\ automation_inc \ )) -$(eval $(call gb_Library_add_precompiled_header,communi,automation/inc/pch/precompiled_automation.hxx)) - $(eval $(call gb_Library_set_include,communi,\ $$(INCLUDE) \ -I$(SRCDIR)/automation/inc/pch \ diff --git a/automation/Library_simplecm.mk b/automation/Library_simplecm.mk index 00b7ace5d83a..130538e06b0c 100644 --- a/automation/Library_simplecm.mk +++ b/automation/Library_simplecm.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,simplecm)) -$(eval $(call gb_Library_add_precompiled_header,simplecm,automation/inc/pch/precompiled_automation.hxx)) - $(eval $(call gb_Library_set_include,simplecm,\ $$(INCLUDE) \ -I$(SRCDIR)/automation/inc \ diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk index eb21f5dfd89b..1448042a7db3 100644 --- a/automation/Library_sts.mk +++ b/automation/Library_sts.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,sts)) -$(eval $(call gb_Library_add_precompiled_header,sts,automation/inc/pch/precompiled_automation.hxx)) - $(eval $(call gb_Library_set_include,sts,\ $$(INCLUDE) \ -I$(WORKDIR)/CustomTarget/automation/source/testtool \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index b1badf4defe9..887917a495b3 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -28,9 +28,6 @@ $(eval $(call gb_Library_Library,basctl)) -$(eval $(call gb_Library_add_precompiled_header,basctl,$(SRCDIR)/basctl/inc/pch/precompiled_basctl)) -$(eval $(call gb_Library_add_precompiled_header,basctl,$(SRCDIR)/basctl/source/basicide/ide_pch)) - $(eval $(call gb_Library_set_componentfile,basctl,basctl/util/basctl)) $(eval $(call gb_Library_set_include,basctl,\ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 50608d4e0585..d8898ecb604e 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,sb)) $(eval $(call gb_Library_add_package_headers,sb,basic_inc)) -$(eval $(call gb_Library_add_precompiled_header,sb,$(SRCDIR)/basic/inc/pch/precompiled_basic)) - $(eval $(call gb_Library_set_componentfile,sb,basic/util/sb)) $(eval $(call gb_Library_set_include,sb,\ diff --git a/basic/StaticLibrary_app.mk b/basic/StaticLibrary_app.mk index 25f3d92fa5d5..7019977f5e55 100644 --- a/basic/StaticLibrary_app.mk +++ b/basic/StaticLibrary_app.mk @@ -30,8 +30,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,app)) $(eval $(call gb_StaticLibrary_add_package_headers,app,basic_inc)) -$(eval $(call gb_StaticLibrary_add_precompiled_header,app,$(SRCDIR)/basic/inc/pch/precompiled_basic)) - $(eval $(call gb_StaticLibrary_set_include,app,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/basic/inc) \ diff --git a/basic/StaticLibrary_sample.mk b/basic/StaticLibrary_sample.mk index b48ff08f721c..de32da999e36 100644 --- a/basic/StaticLibrary_sample.mk +++ b/basic/StaticLibrary_sample.mk @@ -30,8 +30,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sample)) $(eval $(call gb_StaticLibrary_add_package_headers,sample,basic_inc)) -$(eval $(call gb_StaticLibrary_add_precompiled_header,sample,$(SRCDIR)/basic/inc/pch/precompiled_basic)) - $(eval $(call gb_StaticLibrary_set_include,sample,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/basic/inc/pch) \ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index ac79feea7025..e66cce0a6a30 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,canvastools)) $(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc)) -$(eval $(call gb_Library_add_precompiled_header,canvastools,$(SRCDIR)/canvas/inc/pch/precompiled_canvas)) - $(eval $(call gb_Library_set_include,canvastools,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/canvas/inc) \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 7c9960b63e1d..c0bb2bfbe29b 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,chartcontroller)) -$(eval $(call gb_Library_add_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chart2)) - $(eval $(call gb_Library_set_include,chartcontroller,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/chart2/inc/pch) \ diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk index f1f73ced9f7c..5ed414ed5b26 100644 --- a/chart2/Library_chartmodel.mk +++ b/chart2/Library_chartmodel.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,chartmodel)) -$(eval $(call gb_Library_add_precompiled_header,chartmodel,$(SRCDIR)/chart2/inc/pch/precompiled_chart2)) - $(eval $(call gb_Library_set_include,chartmodel,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/chart2/inc/pch) \ diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk index f6a1a42bc22a..b5d82f6ed598 100644 --- a/chart2/Library_charttools.mk +++ b/chart2/Library_charttools.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,charttools)) -$(eval $(call gb_Library_add_precompiled_header,charttools,$(SRCDIR)/chart2/inc/pch/precompiled_chart2)) - $(eval $(call gb_Library_set_include,charttools,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/chart2/inc/pch) \ diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk index 972a0c21dcf9..3bd0a3bd66aa 100644 --- a/chart2/Library_chartview.mk +++ b/chart2/Library_chartview.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,chartview)) -$(eval $(call gb_Library_add_precompiled_header,chartview,$(SRCDIR)/chart2/inc/pch/precompiled_chart2)) - $(eval $(call gb_Library_set_include,chartview,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/chart2/inc/pch) \ diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 23dc13a38781..05325e719ea6 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,comphelper)) $(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc)) -$(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/inc/pch/precompiled_comphelper)) - $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) $(eval $(call gb_Library_set_include,comphelper,\ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 6493829f4d80..b69a1f5bda4d 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,cppcanvas)) $(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc)) -$(eval $(call gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/pch/precompiled_cppcanvas)) - $(eval $(call gb_Library_set_include,cppcanvas,\ -I$(realpath $(SRCDIR)/cppcanvas/inc) \ -I$(realpath $(SRCDIR)/cppcanvas/inc/pch) \ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 0d4639697d0a..b9bea3362953 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,cui)) $(eval $(call gb_Library_set_componentfile,cui,cui/util/cui)) -$(eval $(call gb_Library_add_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precompiled_cui)) - $(eval $(call gb_Library_set_include,cui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/cui/source/inc) \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index e4e665412731..29bb82b9b6fc 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Executable_Executable,odbcconfig)) $(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES)) -$(eval $(call gb_Executable_add_precompiled_header,odbcconfig,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Executable_set_include,odbcconfig,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc) \ diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk index b8eadad37244..03d25cf14ba2 100644 --- a/dbaccess/Library_adabasui.mk +++ b/dbaccess/Library_adabasui.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,adabasui)) -$(eval $(call gb_Library_add_precompiled_header,adabasui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Library_set_include,adabasui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index cd9edf1bd967..d025a717af43 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_add_package_headers,dba,\ dbaccess_inc \ )) -$(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Library_set_include,dba,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc) \ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index d9ae7eae7c02..b70c89bee4cd 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,dbaxml)) -$(eval $(call gb_Library_add_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Library_set_include,dbaxml,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 864b49213e82..6fa3902200ea 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_add_package_headers,dbmm,\ dbaccess_inc \ )) -$(eval $(call gb_Library_add_precompiled_header,dbmm,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Library_set_include,dbmm,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc) \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 6c645c9c2f57..7fe78fc3c9a0 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,dbu)) -$(eval $(call gb_Library_add_precompiled_header,dbu,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Library_set_include,dbu,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc) \ diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index 08088964dc99..e5bcf4ac414d 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -27,7 +27,6 @@ #************************************************************************* $(eval $(call gb_Library_Library,dbui)) -$(eval $(call gb_Library_add_precompiled_header,dbui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbui)) $(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu)) diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 698337085384..c0dc56c23948 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_add_package_headers,sdbt,\ dbaccess_inc \ )) -$(eval $(call gb_Library_add_precompiled_header,sdbt,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) - $(eval $(call gb_Library_set_include,sdbt,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dbaccess/inc) \ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index f62a10270552..0e2fd0c04291 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,crashrep_com)) $(eval $(call gb_Executable_set_targettype_gui,crashrep_com,NO)) -$(eval $(call gb_Executable_add_precompiled_header,crashrep_com,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,crashrep_com,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk index ee515009fa92..3e9f1aa1c1cb 100644 --- a/desktop/Executable_loader2.mk +++ b/desktop/Executable_loader2.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,loader2)) $(eval $(call gb_Executable_set_targettype_gui,loader2,YES)) -$(eval $(call gb_Executable_add_precompiled_header,loader2,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,loader2,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index 3fa9e68f8e5d..7c19cbe1f153 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Executable_Executable,officeloader)) -$(eval $(call gb_Executable_add_precompiled_header,officeloader,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,officeloader,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 63623cf3eb54..3201988725ca 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,oosplash)) $(eval $(call gb_Executable_set_targettype_gui,oosplash,YES)) -$(eval $(call gb_Executable_add_precompiled_header,oosplash,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,oosplash,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 3259cc119fe9..5962fc79b364 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,quickstart)) $(eval $(call gb_Executable_set_targettype_gui,quickstart,YES)) -$(eval $(call gb_Executable_add_precompiled_header,quickstart,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,quickstart,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 14e648705168..3be02bcd5824 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,sbase)) $(eval $(call gb_Executable_set_targettype_gui,sbase,YES)) -$(eval $(call gb_Executable_add_precompiled_header,sbase,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,sbase,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 401e557e298e..fbf06e4415c2 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,scalc)) $(eval $(call gb_Executable_set_targettype_gui,scalc,YES)) -$(eval $(call gb_Executable_add_precompiled_header,scalc,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,scalc,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index e8296e74501c..6413cd719dfa 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,sdraw)) $(eval $(call gb_Executable_set_targettype_gui,sdraw,YES)) -$(eval $(call gb_Executable_add_precompiled_header,sdraw,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,sdraw,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 1b649d8d7276..98e6ff3e167b 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,simpress)) $(eval $(call gb_Executable_set_targettype_gui,simpress,YES)) -$(eval $(call gb_Executable_add_precompiled_header,simpress,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,simpress,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 365c435fae52..3056d25097d0 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,smath)) $(eval $(call gb_Executable_set_targettype_gui,smath,YES)) -$(eval $(call gb_Executable_add_precompiled_header,smath,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,smath,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 776b84f64ff5..9db8c9a5e47d 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Executable_Executable,$(sofficebin))) $(eval $(call gb_Executable_set_targettype_gui,$(sofficebin),YES)) -$(eval $(call gb_Executable_add_precompiled_header,$(sofficebin),desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,$(sofficebin),\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index aebdc1264d25..2587e425a34e 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) -$(eval $(call gb_Executable_add_precompiled_header,soffice,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,soffice,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index cd88fb99e87b..ce29bde71d5a 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,sweb)) $(eval $(call gb_Executable_set_targettype_gui,sweb,YES)) -$(eval $(call gb_Executable_add_precompiled_header,sweb,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,sweb,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 2c18e264eb2e..ab4e9e36d55d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,swriter)) $(eval $(call gb_Executable_set_targettype_gui,swriter,YES)) -$(eval $(call gb_Executable_add_precompiled_header,swriter,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,swriter,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk index f1fe830d29e3..02e14f8d2067 100644 --- a/desktop/Executable_unoinfo.mk +++ b/desktop/Executable_unoinfo.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Executable_Executable,unoinfo)) -$(eval $(call gb_Executable_add_precompiled_header,unoinfo,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,unoinfo,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index d40f4a4e9c6f..7ad007ca0b13 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Executable_Executable,$(unopkgbin))) $(eval $(call gb_Executable_set_targettype_gui,$(unopkgbin),YES)) -$(eval $(call gb_Executable_add_precompiled_header,$(unopkgbin),desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,$(unopkgbin),\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk index ee735094ee03..fe127ad8a4a1 100644 --- a/desktop/Executable_unopkg.com.mk +++ b/desktop/Executable_unopkg.com.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com)) $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO)) -$(eval $(call gb_Executable_add_precompiled_header,unopkg_com,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,unopkg_com,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk index 3703f8cd8639..53d63c35ea3f 100644 --- a/desktop/Executable_unopkg.mk +++ b/desktop/Executable_unopkg.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Executable_Executable,unopkg)) $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES)) -$(eval $(call gb_Executable_add_precompiled_header,unopkg,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Executable_set_include,unopkg,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 60cc182c035e..ae9f43a17110 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,deployment)) -$(eval $(call gb_Library_add_precompiled_header,deployment,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,deployment,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 0b3c541cd25b..dd6d2f12a1e3 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,deploymentgui)) -$(eval $(call gb_Library_add_precompiled_header,deploymentgui,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,deploymentgui,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 83172b93f854..0e69117ad4eb 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,deploymentmisc)) -$(eval $(call gb_Library_add_precompiled_header,deploymentmisc,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,deploymentmisc,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index aac204c4cebb..5f573c1f30f4 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,migrationoo2)) -$(eval $(call gb_Library_add_precompiled_header,migrationoo2,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,migrationoo2,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index 006c7a902799..f705083af373 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,migrationoo3)) -$(eval $(call gb_Library_add_precompiled_header,migrationoo3,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,migrationoo3,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 6d54c613c8e5..8890a6a77e98 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,offacc)) -$(eval $(call gb_Library_add_precompiled_header,offacc,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,offacc,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 15ac285352e2..88bd315efca9 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,sofficeapp)) -$(eval $(call gb_Library_add_precompiled_header,sofficeapp,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Library_set_include,sofficeapp,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index f65d7a8ca48b..ada2292a1c56 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,spl)) -$(eval $(call gb_Library_add_precompiled_header,spl,$(SRCDIR)/desktop/inc/pch/precompiled_desktop)) - $(eval $(call gb_Library_set_include,spl,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 89464da36b48..e6b3aabef345 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,spl_unx)) -$(eval $(call gb_Library_add_precompiled_header,spl_unx,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Library_add_api,spl_unx,\ offapi \ udkapi \ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 5aa3e7195775..5a80814d0646 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,unopkgapp)) -$(eval $(call gb_Library_add_precompiled_header,unopkgapp,desktop/inc/pch/precompiled_desktop.hxx)) - $(eval $(call gb_Library_set_include,unopkgapp,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 340a7543cb72..9c18b531e42b 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,editeng)) $(eval $(call gb_Library_add_package_headers,editeng,editeng_inc)) -$(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng)) - $(eval $(call gb_Library_set_include,editeng,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/editeng/inc/pch) \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 91ec3b0c549c..377c6a869b07 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,frm)) -$(eval $(call gb_Library_add_precompiled_header,frm,$(SRCDIR)/forms/inc/pch/precompiled_forms)) - $(eval $(call gb_Library_set_include,frm,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/forms/inc/pch) \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index c14dcf3590de..8017ffbcc713 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_add_package_headers,for,\ formula_inc \ )) -$(eval $(call gb_Library_add_precompiled_header,for,$(SRCDIR)/formula/inc/pch/precompiled_formula)) - $(eval $(call gb_Library_set_include,for,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/formula/inc/pch) \ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 89716f31f392..01444bd74825 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,forui)) -$(eval $(call gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula)) - $(eval $(call gb_Library_set_include,forui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/formula/inc) \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index fde1aa0bc4d5..d606b8cbf904 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,fwk)) -$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework)) - $(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk)) $(eval $(call gb_Library_set_include,fwk,\ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 1cfb9210171a..339206cb0641 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,hwp)) -$(eval $(call gb_Library_add_precompiled_header,hwp,$(SRCDIR)/hwpfilter/inc/pch/precompiled_hwpfilter)) - $(eval $(call gb_Library_set_include,hwp,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/hwpfilter/inc/pch) \ diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index e03d8b057a5f..8ba1dbb82c18 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Executable_Executable,gencoll_rule)) -$(eval $(call gb_Executable_add_precompiled_header,gencoll_rule,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Executable_set_include,gencoll_rule,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc) \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 4fe66e941739..9a332e194db8 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Executable_Executable,genconv_dict)) -$(eval $(call gb_Executable_add_precompiled_header,genconv_dict,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Executable_set_include,genconv_dict,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc/pch) \ diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index ca603251c41f..262d5d1140e0 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Executable_Executable,gendict)) -$(eval $(call gb_Executable_add_precompiled_header,gendict,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Executable_set_include,gendict,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc/pch) \ diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 93f24831cbde..2230fe590c66 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Executable_Executable,genindex_data)) -$(eval $(call gb_Executable_add_precompiled_header,genindex_data,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Executable_set_include,genindex_data,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc/pch) \ diff --git a/i18npool/Executable_i18npool_cppunittester_all.mk b/i18npool/Executable_i18npool_cppunittester_all.mk index e15117ebe81c..4e96ab7f4bd8 100644 --- a/i18npool/Executable_i18npool_cppunittester_all.mk +++ b/i18npool/Executable_i18npool_cppunittester_all.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_add_defs,i18npool_cppunittester_all,\ $(gb_OBJCXXFLAGS) \ )) -$(eval $(call gb_Executable_add_precompiled_header,i18npool_cppunittester_all,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Executable_set_include,i18npool_cppunittester_all,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc) \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index 4e062f59e112..412107a75b38 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Executable_Executable,saxparser)) -$(eval $(call gb_Executable_add_precompiled_header,saxparser,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Executable_set_include,saxparser,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc/pch) \ diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index b5953b625869..97fde5a7fdb7 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,i18nisolang1)) $(eval $(call gb_Library_add_package_headers,i18nisolang1,i18npool_inc)) -$(eval $(call gb_Library_add_precompiled_header,i18nisolang1,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Library_set_include,i18nisolang1,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc/pch) \ diff --git a/i18npool/Library_i18npaper.mk b/i18npool/Library_i18npaper.mk index 1bf7508ad7bf..348acb57f364 100644 --- a/i18npool/Library_i18npaper.mk +++ b/i18npool/Library_i18npaper.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,i18npaper)) $(eval $(call gb_Library_add_package_headers,i18npaper,i18npool_inc)) -$(eval $(call gb_Library_add_precompiled_header,i18npaper,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Library_set_include,i18npaper,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/i18npool/inc/pch) \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index ba5cae599458..ee47e5d01984 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,i18npool)) $(eval $(call gb_Library_add_package_headers,i18npool,i18npool_generated)) -$(eval $(call gb_Library_add_precompiled_header,i18npool,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool)) $(eval $(call gb_Library_set_include,i18npool,\ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index d5bf09c5b5c7..94bdbd15437a 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,i18nsearch)) $(eval $(call gb_Library_add_package_headers,i18nsearch,i18npool_inc)) -$(eval $(call gb_Library_add_precompiled_header,i18nsearch,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool)) - $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch)) $(eval $(call gb_Library_set_include,i18nsearch,\ diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index 847988108782..25593919fadf 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,lng)) $(eval $(call gb_Library_add_package_headers,lng,linguistic_inc)) -$(eval $(call gb_Library_add_precompiled_header,lng,$(SRCDIR)/linguistic/inc/pch/precompiled_linguistic)) - $(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng)) $(eval $(call gb_Library_set_include,lng,\ diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 3f36f5573cb2..7d86b77e129d 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,package2)) $(eval $(call gb_Library_add_package_headers,package2,package_inc)) -$(eval $(call gb_Library_add_precompiled_header,package2,$(SRCDIR)/package/inc/pch/precompiled_package)) - $(eval $(call gb_Library_set_componentfile,package2,package/util/package2)) $(eval $(call gb_Library_set_include,package2,\ diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 50a28edcb9e7..c37de43a6938 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,xstor)) -$(eval $(call gb_Library_add_precompiled_header,xstor,$(SRCDIR)/package/inc/pch/precompiled_package)) - $(eval $(call gb_Library_set_componentfile,xstor,package/source/xstor/xstor)) $(eval $(call gb_Library_set_include,xstor,\ diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 05a760ab0405..1e7dcd08d4eb 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,rpt)) -$(eval $(call gb_Library_add_precompiled_header,rpt,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign)) - $(eval $(call gb_Library_set_include,rpt,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/reportdesign/inc) \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 4a0cdb85a601..7a1f555edfcc 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,rptui)) -$(eval $(call gb_Library_add_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign)) - $(eval $(call gb_Library_set_include,rptui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/reportdesign/inc) \ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index 95a914c54db6..24a674edc8c7 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,rptxml)) -$(eval $(call gb_Library_add_precompiled_header,rptxml,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign)) - $(eval $(call gb_Library_set_include,rptxml,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/reportdesign/inc) \ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 1fcb2b498a11..a45c239d1cba 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Executable_Executable,rsc)) -$(eval $(call gb_Executable_add_precompiled_header,rsc,$(SRCDIR)/rsc/inc/pch/precompiled_rsc)) - $(eval $(call gb_Executable_set_include,rsc,\ $$(INCLUDE) \ -I$(SRCDIR)/rsc/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index ce7e0c7485e7..b14c7017e456 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -24,8 +24,6 @@ $(eval $(call gb_Library_Library,sc)) $(eval $(call gb_Library_add_sdi_headers,sc,sc/sdi/scslots)) -$(eval $(call gb_Library_add_precompiled_header,sc,$(SRCDIR)/sc/inc/pch/precompiled_sc)) - $(eval $(call gb_Library_set_componentfile,sc,sc/util/sc)) $(eval $(call gb_Library_set_include,sc,\ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index cff297576fa0..4df3819fcdce 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -22,8 +22,6 @@ $(eval $(call gb_Library_Library,scd)) -$(eval $(call gb_Library_add_precompiled_header,scd,$(SRCDIR)/sc/inc/pch/precompiled_sc)) - $(eval $(call gb_Library_set_componentfile,scd,sc/util/scd)) $(eval $(call gb_Library_set_include,scd,\ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 1038c58337bf..c25b15d7d321 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -22,8 +22,6 @@ $(eval $(call gb_Library_Library,scfilt)) -$(eval $(call gb_Library_add_precompiled_header,sc,$(SRCDIR)/sc/source/filter/inc/filt_pch)) - $(eval $(call gb_Library_set_componentfile,scfilt,sc/util/scfilt)) $(eval $(call gb_Library_set_include,scfilt,\ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index b030ad2a5b6b..b39d05cd7131 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,basprov)) -$(eval $(call gb_Library_add_precompiled_header,basprov,$(SRCDIR)/scripting/inc/pch/precompiled_scripting)) - $(eval $(call gb_Library_set_componentfile,basprov,scripting/source/basprov/basprov)) $(eval $(call gb_Library_set_include,basprov,\ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 258734b7b785..5a88b8b1e6bd 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,dlgprov)) -$(eval $(call gb_Library_add_precompiled_header,dlgprov,$(SRCDIR)/scripting/inc/pch/precompiled_scripting)) - $(eval $(call gb_Library_set_componentfile,dlgprov,scripting/source/dlgprov/dlgprov)) $(eval $(call gb_Library_set_include,dlgprov,\ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index ef908ca1ff42..ace2b99af8f3 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,protocolhandler)) -$(eval $(call gb_Library_add_precompiled_header,protocolhandler,$(SRCDIR)/scripting/inc/pch/precompiled_scripting)) - $(eval $(call gb_Library_set_componentfile,protocolhandler,scripting/source/protocolhandler/protocolhandler)) $(eval $(call gb_Library_set_include,protocolhandler,\ diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 16ed0dc8cff6..4a8d87772e4f 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,scriptframe)) -$(eval $(call gb_Library_add_precompiled_header,scriptframe,$(SRCDIR)/scripting/inc/pch/precompiled_scripting)) - $(eval $(call gb_Library_set_componentfile,scriptframe,scripting/util/scriptframe)) $(eval $(call gb_Library_set_include,scriptframe,\ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 28d8e604fddc..c5787d6fd957 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,stringresource)) -$(eval $(call gb_Library_add_precompiled_header,stringresource,$(SRCDIR)/scripting/inc/pch/precompiled_scripting)) - $(eval $(call gb_Library_set_componentfile,stringresource,scripting/source/stringresource/stringresource)) $(eval $(call gb_Library_set_include,stringresource,\ diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 1c70a31ba778..0d8c0a4bd32a 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,vbaevents)) -$(eval $(call gb_Library_add_precompiled_header,vbaevents,$(SRCDIR)/scripting/inc/pch/precompiled_scripting)) - $(eval $(call gb_Library_set_componentfile,vbaevents,scripting/source/vbaevents/vbaevents)) $(eval $(call gb_Library_set_include,vbaevents,\ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9d5309183559..17250d0a9577 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,sd)) -$(eval $(call gb_Library_add_precompiled_header,sd,$(SRCDIR)/sd/inc/pch/precompiled_sd)) - $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots)) $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 08c8c8a70ffc..73b515df5bd6 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,sdd)) -$(eval $(call gb_Library_add_precompiled_header,sdd,$(SRCDIR)/sd/inc/pch/precompiled_sd)) - $(eval $(call gb_Library_set_include,sdd,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/sd/inc) \ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index d4f8c35d59cf..be907a7b5c8f 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,sdfilt)) -$(eval $(call gb_Library_add_precompiled_header,sdfilt,$(SRCDIR)/sd/inc/pch/precompiled_sd)) - $(eval $(call gb_Library_set_include,sdfilt,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/sd/inc) \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 4305fe2fa19b..0a048a966f5a 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,sdui)) -$(eval $(call gb_Library_add_precompiled_header,sdui,$(SRCDIR)/sd/inc/pch/precompiled_sd)) - $(eval $(call gb_Library_set_include,sdui,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/sd/inc) \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ca66a9eb44b8..dfee2ab940e7 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_add_package_headers,sfx,\ sfx2_sdi \ )) -$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2)) - $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 15db2b99d575..ba977500de47 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,OGLTrans)) -$(eval $(call gb_Library_add_precompiled_header,OGLTrans,$(SRCDIR)/sd/inc/pch/precompiled_sd)) - $(eval $(call gb_Library_set_include,OGLTrans,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index cb7a8e089796..f7888e967d4b 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,slideshow)) -$(eval $(call gb_Library_add_precompiled_header,slideshow,$(SRCDIR)/slideshow/inc/pch/precompiled_slideshow)) - $(eval $(call gb_Library_set_include,slideshow,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 25859843602d..afae72e17b09 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -207,7 +207,6 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_package_headers \ - add_precompiled_header \ add_sdi_headers \ add_cflags \ set_cflags \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 786e7422c4ff..60841a0a20d9 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -106,7 +106,6 @@ $(eval $(foreach method,\ use_externals \ add_package_headers \ add_sdi_headers \ - add_precompiled_header \ add_nativeres \ ,\ $(call gb_Executable_forward_to_Linktarget,$(method))\ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 7c55ec024eec..82daae1d97a6 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -148,7 +148,6 @@ $(eval $(foreach method,\ use_externals \ add_package_headers \ add_sdi_headers \ - add_precompiled_header \ export_objects_list \ add_nativeres \ ,\ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 96d5cc763641..c094bb424b54 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -64,9 +64,8 @@ endif # LinkTarget/headers # LinkTarget/dep joined dep file AsmObject/dep CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep # | LinkTarget/headers -# LinkTarget/headers all headers available LinkTarget/external_headers PCH +# LinkTarget/headers all headers available LinkTarget/external_headers # including own generated own generated headers -# PCH precompiled headers (win) LinkTarget/external_headers # LinkTarget/external_headers all external headers avail. header files of linked libs # # CObject plain c compile | LinkTarget/headers @@ -144,42 +143,12 @@ gb_CxxObject_get_source = $(1)/$(2).cxx # defined by platform # gb_CxxObject__command -# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget) -# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This -# should usually be the case. The DEFS/T_CXXFLAGS would have too be manually -# overridden for one object file for them to differ. PCH_CXXFLAGS/PCH_DEFS -# should never be overridden on an object -- they should be the same as for the -# whole linktarget. In general it should be cleaner to use a static library -# compiled with different flags and link that in rather than mixing different -# flags in one linktarget. -define gb_CxxObject__set_pchflags -ifeq ($(gb_ENABLE_PCH),$(true)) -ifneq ($(strip $$(PCH_NAME)),) -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS))) -$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME)) -else -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS))) -$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME)) -else -$$(info No precompiled header available for $$*.) -$$(info precompiled header flags ( ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))) -$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS))) -$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(DEFS))) -$$@ : PCHFLAGS := -endif -endif -endif -endif -endef - $(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%) - $(eval $(gb_CxxObject__set_pchflags)) $(call gb_CxxObject__command,$@,$*,$<,$(call gb_CxxObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_CxxObject_get_dep_target,%) : $(call gb_CxxObject_get_target,%) $(if $(wildcard $@),touch $@,\ - $(eval $(gb_CxxObject__set_pchflags))\ $(call gb_Object__command_dep,$@,$(call gb_CxxObject_get_target,$*))) endif @@ -445,9 +414,6 @@ $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_h # Explanation of some of the variables: # - AUXTARGETS are the additionally generated files that need to be cleaned out # on clean. -# - PCH_CXXFLAGS and PCH_DEFS are the flags that the precompiled headers will -# be compiled with. They should never be overridden in a single object -# files. # - TARGETTYPE is the type of linktarget as some platforms need very different # command to link different targettypes. # @@ -486,15 +452,11 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) -$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) @@ -504,9 +466,6 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LIBS := $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := -$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS := -$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PDBFILE := $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_target,$(1)) : NATIVERES := @@ -523,16 +482,13 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_YACCFLAGS := $$(gb_LinkTarget_YYACFLAGS) $(YACCFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := endif @@ -541,11 +497,8 @@ endef define gb_LinkTarget_add_defs $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2) endif endef @@ -556,12 +509,9 @@ $$(call gb_Output_error,\ else $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2) endif endif @@ -591,11 +541,8 @@ endef define gb_LinkTarget_add_cxxflags $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2) endif endef @@ -606,11 +553,8 @@ $$(call gb_Output_error,\ else $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2) endif endif @@ -972,39 +916,6 @@ $(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_Sdi $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi))) endef -define gb_LinkTarget__add_precompiled_header_impl -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_PrecompiledHeader_get_target,$(3))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3)) -$(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx - -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_NoexPrecompiledHeader_get_target,$(3))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3)) -$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx - -$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3) -$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $(call gb_PrecompiledHeader_get_target,$(3)).obj $(call gb_NoexPrecompiledHeader_get_target,$(3)).obj - -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS) -ifeq ($(gb_FULLDEPS),$(true)) --include \ - $(call gb_PrecompiledHeader_get_dep_target,$(3)) \ - $(call gb_NoexPrecompiledHeader_get_dep_target,$(3)) -$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS) -endif - -endef - -define gb_LinkTarget_add_precompiled_header -ifeq ($(gb_ENABLE_PCH),$(true)) -$(call gb_LinkTarget__add_precompiled_header_impl,$(1),$(2),$(notdir $(2))) -endif - -endef - define gb_LinkTarget_add_external_headers $(call gb_LinkTarget_get_headers_target,$(1) : |$(call gb_Package_get_target,$(2))) endef diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk deleted file mode 100644 index 9e32630f492e..000000000000 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ /dev/null @@ -1,78 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -# PrecompiledHeader class - -ifeq ($(gb_ENABLE_PCH),$(true)) - -# gb_PrecompiledHeader_get_enableflags defined by platform -ifeq ($(gb_DEBUGLEVEL),2) -gb_PrecompiledHeader_DEBUGDIR := debug -gb_NoexPrecompiledHeader_DEBUGDIR := debug -else -gb_PrecompiledHeader_DEBUGDIR := nodebug -gb_NoexPrecompiledHeader_DEBUGDIR := nodebug -endif - -$(call gb_PrecompiledHeader_get_dep_target,%) : - $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) && \ - echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) - -$(call gb_NoexPrecompiledHeader_get_dep_target,%) : - $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) && \ - echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) - -$(call gb_PrecompiledHeader_get_target,%) : - $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE)) - -$(call gb_NoexPrecompiledHeader_get_target,%) : - $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE)) - -.PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%) -$(call gb_PrecompiledHeader_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),PCH,1) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_PrecompiledHeader_get_target,$*) \ - $(call gb_PrecompiledHeader_get_target,$*).obj \ - $(call gb_PrecompiledHeader_get_target,$*).pdb \ - $(call gb_PrecompiledHeader_get_dep_target,$*)) - - -$(call gb_NoexPrecompiledHeader_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),PCH,1) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \ - $(call gb_NoexPrecompiledHeader_get_target,$*).obj \ - $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \ - $(call gb_NoexPrecompiledHeader_get_dep_target,$*)) -endif - -# vim: set noet sw=4: diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index c71847786cdd..23ceef49d62b 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -113,7 +113,6 @@ $(eval $(foreach method,\ use_externals \ add_package_headers \ add_sdi_headers \ - add_precompiled_header \ ,\ $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index afd79ba48aa6..20af9ebdc61c 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -99,14 +99,10 @@ gb_LinkTarget_get_objects_list = $(WORKDIR)/LinkTarget/$(1).objectlist gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) gb_Module_get_target = $(WORKDIR)/Module/$(1) -gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d -gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1) gb_Package_get_target = $(WORKDIR)/Package/$(1) -gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d -gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1) gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst @@ -161,10 +157,8 @@ $(eval $(call gb_Helper_make_clean_targets,\ JunitTest \ LinkTarget \ Module \ - NoexPrecompiledHeader \ PackagePart \ Package \ - PrecompiledHeader \ Pyuno \ RdbTarget \ ResTarget \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 0d0bad3c0475..03f395af2dbc 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -116,12 +116,6 @@ ifneq ($(gb_DEBUGLEVEL),0) gb_SYMBOL := $(true) endif -ifneq ($(strip $(ENABLE_PCH)),) -gb_ENABLE_PCH := $(true) -else -gb_ENABLE_PCH := $(false) -endif - # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) gb_FULLDEPS := $(false) @@ -282,7 +276,6 @@ include $(foreach class, \ Package \ CustomTarget \ ExternalLib \ - PrecompiledHeaders \ Pyuno \ RdbTarget \ CppunitTest \ @@ -396,7 +389,6 @@ INTERACTIVE VARIABLES: 3... = symbols + no optimizations + extra debug output (usually extremely verbose). Levels > 2 are not used very much. - ENABLE_PCH If not empty, use precompiled headers (Windows only). YACCFLAGS Add as flags for YACC parser generator invocation. CPPFLAGS Add as preprocessor flags for C/C++/ObjC/ObjC++ compilation. CFLAGS Add as compiler flags for plain C compilation. diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 6c50a9cbe18a..688d53dc8e63 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -88,11 +88,6 @@ endif gb_LinkTarget_EXCEPTIONFLAGS += \ -fno-enforce-eh-specs \ -gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) - - -gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS) - gb_LinkTarget_LDFLAGS := \ -Wl,--export-all-symbols \ -Wl,--enable-stdcall-fixup \ @@ -139,94 +134,6 @@ $(call gb_Helper_abbreviate_dirs,\ endef -# PrecompiledHeader class - -gb_PrecompiledHeader_EXT := .gch - -gb_PrecompiledHeader_get_enableflags = -I$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR) \ - -DPRECOMPILED_HEADERS \ - -Winvalid-pch \ - -ifeq ($(gb_FULLDEPS),$(true)) -define gb_PrecompiledHeader__command_deponcompile -$(call gb_Helper_abbreviate_dirs,\ - $(OUTDIR_FOR_BUILD)/bin/makedepend \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \ - $(3) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(1) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - -v REPODIR=$(REPODIR)/ \ - > $(call gb_PrecompiledHeader_get_dep_target,$(2))) -endef -else -gb_PrecompiledHeader__command_deponcompile = -endif - -define gb_PrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - -x c++-header \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(6) \ - -c $(3) \ - -o$(1)) -$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - -endef - -# NoexPrecompiledHeader class - -gb_NoexPrecompiledHeader_EXT := .gch - -gb_NoexPrecompiledHeader_get_enableflags = -I$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR) \ - -Winvalid-pch \ - -ifeq ($(gb_FULLDEPS),$(true)) -define gb_NoexPrecompiledHeader__command_deponcompile -$(call gb_Helper_abbreviate_dirs,\ - $(OUTDIR_FOR_BUILD)/bin/makedepend \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \ - $(3) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(1) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - -v REPODIR=$(REPODIR)/ \ - > $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) -endef -else -gb_NoexPrecompiledHeader__command_deponcompile = -endif - -define gb_NoexPrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - -x c++-header \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(6) \ - -c $(3) \ - -o$(1)) -$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - -endef - - # AsmObject class gb_AsmObject_get_source = $(1)/$(2).s diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 16694b34a1b4..3051f5d1f407 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -204,14 +204,9 @@ gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -EHa \ -gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) - - gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ -gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS) - gb_LinkTarget_LDFLAGS := \ -MACHINE:IX86 \ -MANIFEST \ @@ -294,7 +289,6 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(DEFS) \ $(T_CFLAGS) \ -Fd$(PDBFILE) \ - $(PCHFLAGS) \ $(gb_COMPILERDEPFLAGS) \ -I$(realpath $(dir $(3))) \ $(INCLUDE) \ @@ -313,7 +307,6 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(DEFS) \ $(T_CXXFLAGS) \ -Fd$(PDBFILE) \ - $(PCHFLAGS) \ $(gb_COMPILERDEPFLAGS) \ -I$(realpath $(dir $(3))) \ $(INCLUDE_STL) $(INCLUDE) \ @@ -322,42 +315,6 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -# PrecompiledHeader class - -gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \ - -Fp$(call gb_PrecompiledHeader_get_target,$(1)) - -define gb_PrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs_native,\ - mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - $(4) $(5) -Fd$(PDBFILE) \ - $(gb_COMPILERDEPFLAGS) \ - -I$(realpath $(dir $(3))) \ - $(6) \ - -c $(realpath $(3)) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2)),$(realpath $(3))) -endef - -# NoexPrecompiledHeader class - -gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \ - -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) - -define gb_NoexPrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs_native,\ - mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - $(4) $(5) -Fd$(PDBFILE) \ - $(gb_COMPILERDEPFLAGS) \ - -I$(realpath $(dir $(3))) \ - $(6) \ - -c $(realpath $(3)) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_NoexPrecompiledHeader,$(2)),$(realpath $(3))) -endef - # AsmObject class gb_AsmObject_get_source = $(1)/$(2).asm @@ -396,7 +353,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ - $(PCHOBJS) $(NATIVERES))) && \ + $(NATIVERES))) && \ $(gb_LINK) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk index 249bbdfced2c..164617b28349 100644 --- a/solenv/gbuild/templates/Library.mk +++ b/solenv/gbuild/templates/Library.mk @@ -35,10 +35,6 @@ $(eval $(call gb_Library_Library,LIB)) # learn more about TYPE in the Package.mk template $(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE)) -# for platforms supporting PCH: declare the location of the pch file -# this is the name of the cxx file (without extension) -$(eval $(call gb_Library_add_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE)) - # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE)) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index dd7cc8d66cee..4791d82acba4 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,sot)) $(eval $(call gb_Library_add_package_headers,sot,sot_inc)) -$(eval $(call gb_Library_add_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precompiled_sot)) - $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot)) $(eval $(call gb_Library_set_include,sot,\ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 9c4a6904450e..1c050d80d880 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -24,8 +24,6 @@ $(eval $(call gb_Library_Library,sm)) $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) -$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) - $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) $(eval $(call gb_Library_set_include,sm,\ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 6f98c93349b9..b60542f574f8 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,smd)) -$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) - $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) $(eval $(call gb_Library_set_include,smd,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 0fb7477c12f7..7a793296e170 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,svl)) $(eval $(call gb_Library_add_package_headers,svl,svl_inc)) -$(eval $(call gb_Library_add_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl)) - $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 1b5d82a9d6f6..4f72253e281d 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,svt)) $(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) -$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) - $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt)) $(eval $(call gb_Library_add_api,svt,\ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 60a510137fb4..99ddbcbcae9b 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,sw)) $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) -$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) - $(eval $(call gb_Library_set_componentfile,sw,sw/util/sw)) $(eval $(call gb_Library_set_include,sw,\ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9a80827b8392..ea66bdf7e6b0 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk)) $(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) -#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit)) - $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/toolkit/inc) \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 57beb90686d6..ccf02568dd13 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_Library,tl)) $(eval $(call gb_Library_add_package_headers,tl,tools_inc)) $(eval $(call gb_Library_add_package_headers,tl,tools_reversemap)) -$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) - $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/tools/inc) \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 5fe25ca71f0a..c6269993395c 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,ucbhelper)) $(eval $(call gb_Library_add_package_headers,ucbhelper,ucbhelper_inc)) -$(eval $(call gb_Library_add_precompiled_header,ucbhelper,$(SRCDIR)/ucbhelper/inc/pch/precompiled_ucbhelper)) - $(eval $(call gb_Library_set_include,ucbhelper,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/ucbhelper/inc) \ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 6b9f32bdb4e7..febe67db5053 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -34,10 +34,6 @@ $(eval $(call gb_Library_Library,utl)) # learn more about TYPE in the Package.mk template $(eval $(call gb_Library_add_package_headers,utl,unotools_inc)) -# for platforms supporting PCH: declare the location of the pch file -# this is the name of the cxx file (without extension) -$(eval $(call gb_Library_add_precompiled_header,utl,$(SRCDIR)/unotools/inc/pch/precompiled_unotools)) - # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 2f6e26df295c..235042500da2 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -32,10 +32,6 @@ # LIB is the name of the library as it is found in Repository.mk $(eval $(call gb_Library_Library,msforms)) -# for platforms supporting PCH: declare the location of the pch file -# this is the name of the cxx file (without extension) -#$(eval $(call gb_Library_add_precompiled_header,msforms,$(SRCDIR)/vbahelper/PCH_FILE)) - # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms)) diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index a0788ed19637..eee707dbbe0e 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,vbahelper)) $(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc)) -# for platforms supporting PCH: declare the location of the pch file -# this is the name of the cxx file (without extension) -#$(eval $(call gb_Library_add_precompiled_header,vbahelper,$(SRCDIR)/vbahelper/PCH_FILE)) - # in case UNO services are exported: declare location of component file #$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE)) diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 2bae9ef0a25e..0968ba4d7a84 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_Library,desktop_detector)) #$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) -$(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,desktop_detector,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/vcl/inc) \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 02723f37fed9..19c4c46fca1e 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) -$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff)) - $(eval $(call gb_Library_set_include,xo,\ $$(SOLARINC) \ -I$(realpath $(SRCDIR)/xmloff/inc) \ diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index ea02e1a189e9..a061e3380540 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,xmlsecurity)) -$(eval $(call gb_Library_add_precompiled_header,xmlsecurity,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity)) - $(eval $(call gb_Library_set_componentfile,xmlsecurity,xmlsecurity/util/xmlsecurity)) $(eval $(call gb_Library_set_include,xmlsecurity,\ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 78e23c4e5f29..4c2d7377042d 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,xsec_fw)) -$(eval $(call gb_Library_add_precompiled_header,xsec_fw,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity)) - $(eval $(call gb_Library_set_componentfile,xsec_fw,xmlsecurity/util/xsec_fw)) $(eval $(call gb_Library_set_include,xsec_fw,\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 90dcad0ee939..c00ed118635f 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_Library,xsec_xmlsec)) -$(eval $(call gb_Library_add_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec.windows)) else |