[Libreoffice-commits] .: 3 commits - accessibility/inc autodoc/source automation/Executable_miniapp.mk automation/Executable_testtool.mk automation/Library_communi.mk automation/Library_simplecm.mk automation/Library_sts.mk basctl/Library_basctl.mk basic/Library_sb.mk basic/StaticLibrary_app.mk basic/StaticLibrary_sample.mk bridges/inc canvas/Library_canvastools.mk chart2/Library_chartcontroller.mk chart2/Library_chartmodel.mk chart2/Library_charttools.mk chart2/Library_chartview.mk cli_ure/inc codemaker/inc comphelper/Library_comphelp.mk configmgr/inc configure.in connectivity/inc cosv/source cppcanvas/Library_cppcanvas.mk cppuhelper/inc cppu/inc cui/Library_cui.mk dbaccess/Executable_odbcconfig.mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbui.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk desktop/Executable_crashrep.com.mk desktop/Executable_loader2.mk desktop/Executable_officeloader.mk desktop/Executa ble_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unoinfo.mk desktop/Executable_unopkg.bin.mk desktop/Executable_unopkg.com.mk desktop/Executable_unopkg.mk desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_spl_unx.mk desktop/Library_unopkgapp.mk desktop/qa editeng/Library_editeng.mk embeddedobj/inc extensions/inc filter/inc forms/Library_frm.mk formula/Library_for.mk formula/Library_forui.mk fpicker/inc framework/Library_fwk.mk hwpfilter/Library_hwp.mk i18npool/Executable_gencoll_rule.mk i18npool /Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_i18npool_cppunittester_all.mk i18npool/Executable_saxparser.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npaper.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk idlc/inc io/inc javaunohelper/inc jvmfwk/inc l10ntools/inc lingucomponent/inc linguistic/Library_lng.mk odk/inc package/Library_package2.mk package/Library_xstor.mk registry/inc reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk rsc/Executable_rsc.mk sal/inc sal/osl sal/rtl sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk scp2/source scripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk sdext/inc sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk set_soenv.in sfx2/Library_ sfx.mk shell/inc slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk solenv/gbuild solenv/inc sot/Library_sot.mk starmath/Library_smd.mk starmath/Library_sm.mk stoc/inc store/inc svl/Library_svl.mk svtools/Library_svt.mk sw/Library_sw.mk testtools/inc toolkit/Library_tk.mk tools/Library_tl.mk ucbhelper/Library_ucbhelper.mk ucb/inc udm/source unotools/Library_utl.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/Library_desktop_detector.mk xmerge/inc xmlhelp/inc xmloff/Library_xo.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_xmlsec.mk
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Nov 27 10:43:20 PST 2011
accessibility/inc/makefile.mk | 8 -
autodoc/source/mkinc/fullcpp.mk | 14 --
automation/Executable_miniapp.mk | 2
automation/Executable_testtool.mk | 2
automation/Library_communi.mk | 2
automation/Library_simplecm.mk | 2
automation/Library_sts.mk | 2
basctl/Library_basctl.mk | 3
basic/Library_sb.mk | 2
basic/StaticLibrary_app.mk | 2
basic/StaticLibrary_sample.mk | 2
bridges/inc/makefile.mk | 7 -
canvas/Library_canvastools.mk | 2
chart2/Library_chartcontroller.mk | 2
chart2/Library_chartmodel.mk | 2
chart2/Library_charttools.mk | 2
chart2/Library_chartview.mk | 2
cli_ure/inc/makefile.mk | 8 -
codemaker/inc/makefile.mk | 7 -
comphelper/Library_comphelp.mk | 2
configmgr/inc/makefile.mk | 3
configure.in | 22 ----
connectivity/inc/makefile.mk | 8 -
cosv/source/fullcpp.mk | 12 --
cppcanvas/Library_cppcanvas.mk | 2
cppu/inc/makefile.mk | 8 -
cppuhelper/inc/makefile.mk | 8 -
cui/Library_cui.mk | 2
dbaccess/Executable_odbcconfig.mk | 2
dbaccess/Library_adabasui.mk | 2
dbaccess/Library_dba.mk | 2
dbaccess/Library_dbaxml.mk | 2
dbaccess/Library_dbmm.mk | 2
dbaccess/Library_dbu.mk | 2
dbaccess/Library_dbui.mk | 1
dbaccess/Library_sdbt.mk | 2
desktop/Executable_crashrep.com.mk | 2
desktop/Executable_loader2.mk | 2
desktop/Executable_officeloader.mk | 2
desktop/Executable_oosplash.mk | 2
desktop/Executable_quickstart.mk | 2
desktop/Executable_sbase.mk | 2
desktop/Executable_scalc.mk | 2
desktop/Executable_sdraw.mk | 2
desktop/Executable_simpress.mk | 2
desktop/Executable_smath.mk | 2
desktop/Executable_soffice.bin.mk | 2
desktop/Executable_soffice.mk | 2
desktop/Executable_sweb.mk | 2
desktop/Executable_swriter.mk | 2
desktop/Executable_unoinfo.mk | 2
desktop/Executable_unopkg.bin.mk | 2
desktop/Executable_unopkg.com.mk | 2
desktop/Executable_unopkg.mk | 2
desktop/Library_deployment.mk | 2
desktop/Library_deploymentgui.mk | 2
desktop/Library_deploymentmisc.mk | 2
desktop/Library_migrationoo2.mk | 2
desktop/Library_migrationoo3.mk | 2
desktop/Library_offacc.mk | 2
desktop/Library_sofficeapp.mk | 2
desktop/Library_spl.mk | 2
desktop/Library_spl_unx.mk | 2
desktop/Library_unopkgapp.mk | 2
desktop/qa/deployment_misc/makefile.mk | 6 -
editeng/Library_editeng.mk | 2
embeddedobj/inc/makefile.mk | 8 -
extensions/inc/makefile.mk | 8 -
filter/inc/makefile.mk | 8 -
forms/Library_frm.mk | 2
formula/Library_for.mk | 2
formula/Library_forui.mk | 2
fpicker/inc/makefile.mk | 8 -
framework/Library_fwk.mk | 2
hwpfilter/Library_hwp.mk | 2
i18npool/Executable_gencoll_rule.mk | 2
i18npool/Executable_genconv_dict.mk | 2
i18npool/Executable_gendict.mk | 2
i18npool/Executable_genindex_data.mk | 2
i18npool/Executable_i18npool_cppunittester_all.mk | 2
i18npool/Executable_saxparser.mk | 2
i18npool/Library_i18nisolang1.mk | 2
i18npool/Library_i18npaper.mk | 2
i18npool/Library_i18npool.mk | 2
i18npool/Library_i18nsearch.mk | 2
idlc/inc/makefile.mk | 8 -
io/inc/makefile.mk | 9 -
javaunohelper/inc/makefile.mk | 8 -
jvmfwk/inc/makefile.mk | 8 -
l10ntools/inc/makefile.mk | 7 -
lingucomponent/inc/makefile.mk | 8 -
linguistic/Library_lng.mk | 2
odk/inc/makefile.mk | 8 -
package/Library_package2.mk | 2
package/Library_xstor.mk | 2
registry/inc/makefile.mk | 8 -
reportdesign/Library_rpt.mk | 2
reportdesign/Library_rptui.mk | 2
reportdesign/Library_rptxml.mk | 2
rsc/Executable_rsc.mk | 2
sal/inc/makefile.mk | 8 -
sal/osl/all/makefile.mk | 4
sal/osl/unx/makefile.mk | 4
sal/osl/w32/makefile.mk | 4
sal/rtl/source/makefile.mk | 4
sc/Library_sc.mk | 2
sc/Library_scd.mk | 2
sc/Library_scfilt.mk | 2
scp2/source/accessories/makefile.mk | 2
scp2/source/activex/makefile.mk | 2
scp2/source/base/makefile.mk | 2
scp2/source/binfilter/makefile.mk | 2
scp2/source/calc/makefile.mk | 2
scp2/source/canvas/makefile.mk | 2
scp2/source/crashrep/makefile.mk | 2
scp2/source/draw/makefile.mk | 2
scp2/source/extensions/makefile.mk | 2
scp2/source/gnome/makefile.mk | 2
scp2/source/graphicfilter/makefile.mk | 2
scp2/source/impress/makefile.mk | 2
scp2/source/javafilter/makefile.mk | 2
scp2/source/kde/makefile.mk | 2
scp2/source/math/makefile.mk | 2
scp2/source/onlineupdate/makefile.mk | 2
scp2/source/ooo/makefile.mk | 2
scp2/source/python/makefile.mk | 2
scp2/source/quickstart/makefile.mk | 2
scp2/source/testtool/makefile.mk | 2
scp2/source/winexplorerext/makefile.mk | 2
scp2/source/writer/makefile.mk | 2
scp2/source/xsltfilter/makefile.mk | 2
scripting/Library_basprov.mk | 2
scripting/Library_dlgprov.mk | 2
scripting/Library_protocolhandler.mk | 2
scripting/Library_scriptframe.mk | 2
scripting/Library_stringresource.mk | 2
scripting/Library_vbaevents.mk | 2
sd/Library_sd.mk | 2
sd/Library_sdd.mk | 2
sd/Library_sdfilt.mk | 2
sd/Library_sdui.mk | 2
sdext/inc/makefile.mk | 8 -
set_soenv.in | 1
sfx2/Library_sfx.mk | 2
shell/inc/makefile.mk | 8 -
slideshow/Library_OGLTrans.mk | 2
slideshow/Library_slideshow.mk | 2
solenv/gbuild/CppunitTest.mk | 1
solenv/gbuild/Executable.mk | 1
solenv/gbuild/Library.mk | 1
solenv/gbuild/LinkTarget.mk | 91 ----------------
solenv/gbuild/PrecompiledHeaders.mk | 78 --------------
solenv/gbuild/StaticLibrary.mk | 1
solenv/gbuild/TargetLocations.mk | 6 -
solenv/gbuild/gbuild.mk | 8 -
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 93 -----------------
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 45 --------
solenv/gbuild/templates/Library.mk | 4
solenv/inc/rules.mk | 118 ++++++----------------
solenv/inc/settings.mk | 4
solenv/inc/unxgcc.mk | 5
solenv/inc/unxiosr.mk | 2
solenv/inc/unxmacx.mk | 7 -
solenv/inc/wntgcci.mk | 6 -
solenv/inc/wntmsc.mk | 12 --
sot/Library_sot.mk | 2
starmath/Library_sm.mk | 2
starmath/Library_smd.mk | 2
stoc/inc/makefile.mk | 8 -
store/inc/makefile.mk | 8 -
svl/Library_svl.mk | 2
svtools/Library_svt.mk | 2
sw/Library_sw.mk | 2
testtools/inc/makefile.mk | 8 -
toolkit/Library_tk.mk | 2
tools/Library_tl.mk | 2
ucb/inc/makefile.mk | 9 -
ucbhelper/Library_ucbhelper.mk | 2
udm/source/mkinc/fullcpp.mk | 16 --
unotools/Library_utl.mk | 4
vbahelper/Library_msforms.mk | 4
vbahelper/Library_vbahelper.mk | 4
vcl/Library_desktop_detector.mk | 2
xmerge/inc/makefile.mk | 8 -
xmlhelp/inc/makefile.mk | 7 -
xmloff/Library_xo.mk | 2
xmlsecurity/Library_xmlsecurity.mk | 2
xmlsecurity/Library_xsec_fw.mk | 2
xmlsecurity/Library_xsec_xmlsec.mk | 2
189 files changed, 42 insertions(+), 1023 deletions(-)
New commits:
commit e4610ffd2d19b9750109cbaa6fd78c8ceed1aecd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Nov 27 12:26:12 2011 -0600
remove PCH support in dmake-module
diff --git a/accessibility/inc/makefile.mk b/accessibility/inc/makefile.mk
index 3afcad1..4d0eb53 100644
--- a/accessibility/inc/makefile.mk
+++ b/accessibility/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
index 00f08bd..b126f0f 100644
--- a/autodoc/source/mkinc/fullcpp.mk
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -39,17 +39,3 @@ CFLAGS+= -GR
"$(OS)"=="DRAGONFLY" || $(COM) == "GCC"
CFLAGSCXX+= -frtti
.ENDIF
-
-
-
-# Precompiled Headers
-.IF "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
-
-PCH_NAME=autodoc
-.IF "$(debug)"==""
-CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd
-.ENDIF
-
-.ENDIF # "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
diff --git a/bridges/inc/makefile.mk b/bridges/inc/makefile.mk
index de828a7..a7ab4cd 100644
--- a/bridges/inc/makefile.mk
+++ b/bridges/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/cli_ure/inc/makefile.mk b/cli_ure/inc/makefile.mk
index 09c36cb..8f13775 100644
--- a/cli_ure/inc/makefile.mk
+++ b/cli_ure/inc/makefile.mk
@@ -38,11 +38,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/codemaker/inc/makefile.mk b/codemaker/inc/makefile.mk
index 99789bf..8d7b0a7 100644
--- a/codemaker/inc/makefile.mk
+++ b/codemaker/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
index 3dd2fc4..57c635f 100755
--- a/configmgr/inc/makefile.mk
+++ b/configmgr/inc/makefile.mk
@@ -33,6 +33,3 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
.INCLUDE: target.mk
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
-.ENDIF
diff --git a/configure.in b/configure.in
index 4ddf365..2f8cf7f 100644
--- a/configure.in
+++ b/configure.in
@@ -2639,7 +2639,7 @@ AC_SUBST(HYPH_SYSTEM_DIR)
AC_SUBST(THES_SYSTEM_DIR)
dnl ===================================================================
-dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
+dnl ENABLE_PCH i now a no-op
dnl ===================================================================
AC_MSG_CHECKING([whether to enable pch feature])
AC_MSG_RESULT([no, obsolete])
diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk
index 51a3f22..86bf408 100755
--- a/connectivity/inc/makefile.mk
+++ b/connectivity/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk
index 3103f63..4c80058 100644
--- a/cosv/source/fullcpp.mk
+++ b/cosv/source/fullcpp.mk
@@ -36,18 +36,6 @@
# RTTI
CFLAGS+= -GR
-.IF "$(NP_LOCALBUILD)"!=""
-
-# Precompiled Headers
-PCH_NAME= cosv
-.IF "$(DBG_LEVEL)"<"2"
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
-.ENDIF
-
-.ENDIF
-
.ENDIF
.IF "$(COM)"=="GCC"
diff --git a/cppu/inc/makefile.mk b/cppu/inc/makefile.mk
index 47a2532..e8f3eba 100644
--- a/cppu/inc/makefile.mk
+++ b/cppu/inc/makefile.mk
@@ -38,11 +38,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/cppuhelper/inc/makefile.mk b/cppuhelper/inc/makefile.mk
index 0208c0d..5b85c1f 100644
--- a/cppuhelper/inc/makefile.mk
+++ b/cppuhelper/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 54341a3..bd2f191 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -37,12 +37,6 @@ VISIBILITY_HIDDEN := TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-# TODO: On Windows, test_dp_version.cxx fails due to BOOL redefinition between
-# windef.h and tools/solar.h caused by including "precompiled_desktop.hxx"; this
-# hack to temporarily disable PCH will become unnecessary with the fix for issue
-# 112600:
-CFLAGSCXX += -DDISABLE_PCH_HACK
-
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_dp_version.obj
SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
diff --git a/embeddedobj/inc/makefile.mk b/embeddedobj/inc/makefile.mk
index 29b98e8..060094c 100755
--- a/embeddedobj/inc/makefile.mk
+++ b/embeddedobj/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=embeddedobj
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/extensions/inc/makefile.mk b/extensions/inc/makefile.mk
index 9ea45ec..82d75be 100644
--- a/extensions/inc/makefile.mk
+++ b/extensions/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/filter/inc/makefile.mk b/filter/inc/makefile.mk
index ae44f91..fe07083 100644
--- a/filter/inc/makefile.mk
+++ b/filter/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/fpicker/inc/makefile.mk b/fpicker/inc/makefile.mk
index 8d04d47..4624443 100644
--- a/fpicker/inc/makefile.mk
+++ b/fpicker/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/idlc/inc/makefile.mk b/idlc/inc/makefile.mk
index e912e1d..07d7afa 100644
--- a/idlc/inc/makefile.mk
+++ b/idlc/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/io/inc/makefile.mk b/io/inc/makefile.mk
index e327f58..1a0bae8 100644
--- a/io/inc/makefile.mk
+++ b/io/inc/makefile.mk
@@ -38,12 +38,3 @@ TARGET=inc
.ENDIF # L10N_framework
.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-.ENDIF # L10N_framework
-
diff --git a/javaunohelper/inc/makefile.mk b/javaunohelper/inc/makefile.mk
index b9f61c2..072e7df 100644
--- a/javaunohelper/inc/makefile.mk
+++ b/javaunohelper/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/jvmfwk/inc/makefile.mk b/jvmfwk/inc/makefile.mk
index 8acb7b2..3aec902 100644
--- a/jvmfwk/inc/makefile.mk
+++ b/jvmfwk/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/l10ntools/inc/makefile.mk b/l10ntools/inc/makefile.mk
index ce0925c..8d628b1 100644
--- a/l10ntools/inc/makefile.mk
+++ b/l10ntools/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/lingucomponent/inc/makefile.mk b/lingucomponent/inc/makefile.mk
index bf9eb26..ca92f6c 100644
--- a/lingucomponent/inc/makefile.mk
+++ b/lingucomponent/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/odk/inc/makefile.mk b/odk/inc/makefile.mk
index c22fda1..47ac06c 100644
--- a/odk/inc/makefile.mk
+++ b/odk/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/registry/inc/makefile.mk b/registry/inc/makefile.mk
index 1a21231..203cb85 100644
--- a/registry/inc/makefile.mk
+++ b/registry/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/sal/inc/makefile.mk b/sal/inc/makefile.mk
index 19d6b36..c1eadac 100644
--- a/sal/inc/makefile.mk
+++ b/sal/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index e76388a..efd011f 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -32,10 +32,6 @@ TARGET=oslall
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
MULTITHREAD_OBJ=TRUE
# --- Settings -----------------------------------------------------
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 2ec11e1..58d496f 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -35,10 +35,6 @@ TARGET=cpposl
.ENDIF
USE_LDUMP2=TRUE
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
TARGETTYPE=CUI
ENABLE_EXCEPTIONS=TRUE
diff --git a/sal/osl/w32/makefile.mk b/sal/osl/w32/makefile.mk
index 08e8745..7b40397 100644
--- a/sal/osl/w32/makefile.mk
+++ b/sal/osl/w32/makefile.mk
@@ -32,10 +32,6 @@ TARGET=cpposl
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
MULTITHREAD_OBJ=TRUE
# --- Settings -----------------------------------------------------
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 60953f8..83cb0ed 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -32,10 +32,6 @@ TARGET=cpprtl
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
TARGETTYPE=CUI
# --- Settings -----------------------------------------------------
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
index 45c81ca..e3ad66f 100644
--- a/scp2/source/accessories/makefile.mk
+++ b/scp2/source/accessories/makefile.mk
@@ -28,8 +28,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=accessories
TARGETTYPE=CUI
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index fb4342e..b058351 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=activex
TARGETTYPE=CUI
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
index ead15b1..3386005 100644
--- a/scp2/source/base/makefile.mk
+++ b/scp2/source/base/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=base
TARGETTYPE=CUI
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
index f7882a3..9a8c0a5 100644
--- a/scp2/source/binfilter/makefile.mk
+++ b/scp2/source/binfilter/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=binfilter
TARGETTYPE=CUI
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
index e049057..3a1fa47 100644
--- a/scp2/source/calc/makefile.mk
+++ b/scp2/source/calc/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=calc
TARGETTYPE=CUI
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 442f212..7ce0257 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=canvas
TARGETTYPE=CUI
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
index 5e81014..925b9a6 100644
--- a/scp2/source/crashrep/makefile.mk
+++ b/scp2/source/crashrep/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=crashrep
TARGETTYPE=CUI
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
index 605300d..740fc10 100644
--- a/scp2/source/draw/makefile.mk
+++ b/scp2/source/draw/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=draw
TARGETTYPE=CUI
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
index 00b23ae..a2c6299 100644
--- a/scp2/source/extensions/makefile.mk
+++ b/scp2/source/extensions/makefile.mk
@@ -29,8 +29,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=extensions
TARGETTYPE=CUI
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 43c2440..eb9120d 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=gnome
TARGETTYPE=CUI
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
index 522a22d..0051483 100644
--- a/scp2/source/graphicfilter/makefile.mk
+++ b/scp2/source/graphicfilter/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=graphicfilter
TARGETTYPE=CUI
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index 0a67e86..44bbc2f 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=impress
TARGETTYPE=CUI
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
index 49f50ab..05be4d6 100644
--- a/scp2/source/javafilter/makefile.mk
+++ b/scp2/source/javafilter/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=javafilter
TARGETTYPE=CUI
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 32d7138..02323ff 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=kde
TARGETTYPE=CUI
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
index b622097..055e3a9 100644
--- a/scp2/source/math/makefile.mk
+++ b/scp2/source/math/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=math
TARGETTYPE=CUI
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
index 4b3ce93..dd14e9b 100644
--- a/scp2/source/onlineupdate/makefile.mk
+++ b/scp2/source/onlineupdate/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=update
TARGETTYPE=CUI
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 2a89eca..be79403 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -26,8 +26,6 @@
#*************************************************************************
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=ooo
TARGETTYPE=CUI
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index f3bff44..dffc045 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=python
TARGETTYPE=CUI
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
index 283d220..bb40db2 100644
--- a/scp2/source/quickstart/makefile.mk
+++ b/scp2/source/quickstart/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=quickstart
TARGETTYPE=CUI
diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk
index edcad2e..debb27f 100644
--- a/scp2/source/testtool/makefile.mk
+++ b/scp2/source/testtool/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=testtool
TARGETTYPE=CUI
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 0c193c2..98b716b 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=winexpext
TARGETTYPE=CUI
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
index 136079b..6fd453d 100644
--- a/scp2/source/writer/makefile.mk
+++ b/scp2/source/writer/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=writer
TARGETTYPE=CUI
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
index a9c6c9f..5c586f2 100644
--- a/scp2/source/xsltfilter/makefile.mk
+++ b/scp2/source/xsltfilter/makefile.mk
@@ -27,8 +27,6 @@
PRJ=..$/..
-PRJPCH=
-
PRJNAME=scp2
TARGET=xsltfilter
TARGETTYPE=CUI
diff --git a/sdext/inc/makefile.mk b/sdext/inc/makefile.mk
index 637bde8..8851cad 100644
--- a/sdext/inc/makefile.mk
+++ b/sdext/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk
index c297cb4..0cef5fa 100755
--- a/shell/inc/makefile.mk
+++ b/shell/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index cc2d8df..6700845 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -32,11 +32,11 @@ $(OBJ)/%.obj : %.cxx
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
-.IF "$(noadjust)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(noadjust)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(noadjust)"==""
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(noadjust)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -56,9 +56,9 @@ $(OBJ)/%.obj : %.cpp
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -78,9 +78,9 @@ $(OBJ)/%.obj : %.cc
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@$(RM) $@
@@ -91,70 +91,26 @@ $(OBJ)/%.obj : %.cc
.ENDIF
.ENDIF
-.IF "$(ENABLE_PCH)"!=""
-PCHOUTDIR=$(SLO)/pch
-PCHEXOUTDIR=$(SLO)/pch_ex
-
-$(SLO)/precompiled.% .PHONY:
- -$(MKDIRHIER) $(SLO)/pch
-.IF "$(COM)"=="MSC"
- $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
- $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
- @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
-.ELSE # "$(COM)"=="MSC"
- @$(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF # "$(COM)"=="MSC"
- @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk
-
-$(SLO)/precompiled_ex.% .PHONY:
- -$(MKDIRHIER) $(SLO)/pch_ex
-.IF "$(COM)"=="MSC"
- $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
- $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
- @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
-.ELSE # "$(COM)"=="MSC"
- @$(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF # "$(COM)"=="MSC"
- @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk
-
-.INCLUDE .IGNORE : $(INCCOM)/pch.mk
-.INCLUDE .IGNORE : $(INCCOM)/pch_ex.mk
-.ENDIF # "$(ENABLE_PCH)"!=""
-
$(SLO)/%.obj : %.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(ENABLE_PCH)"!=""
-# just a helper var
- @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
-# cleanup first
- @noop $(assign ACT_PCH_SWITCHES:=$(NULL))
-# eq: first string is a copy of the compile line,
-# second generated by pch creation
-# use pch with exception support
- @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_EXCEPTIONS_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_EXCEPTIONS_PCH) $(NULL)))
-# use pch without exception support
- @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL)))
-.ENDIF # "$(ENABLE_PCH)"!=""
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
+ $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE # "$(GUI)"=="UNX"
@@-$(RM) $@
.IF "$(COM)"=="GCC"
- $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
+ $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.ELSE
- $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
-.ENDIF # "$(COM)"=="GCC"
+ $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
+.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(GUI)"=="UNX"
.IF "$(nodep)"==""
# fixme: write to file
@@ -170,9 +126,9 @@ $(SLO)/%.obj : %.cpp
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -196,9 +152,9 @@ $(SLO)/%.obj : $(MISC)/%.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -221,9 +177,9 @@ $(SLO)/%.obj : $(MISC)/%.cc
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -238,9 +194,9 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -263,11 +219,11 @@ $(OBJ)/%.obj : %.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
-.IF "$(noadjust)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(noadjust)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(noadjust)"==""
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(noadjust)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -290,9 +246,9 @@ $(OBJ)/%.obj : $(MISC)/%.c
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -312,9 +268,9 @@ $(SLO)/%.obj : $(MISC)/%.c
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -335,9 +291,9 @@ $(SLO)/%.obj : %.c
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
+.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -518,20 +474,20 @@ $(MISC)/o_%.dpcc : %.m
$(MISC)/s_%.dpcc : $(MISC)/%.m
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(GUI)"=="UNX"
@echo $@ : $(SLO)/$(<:b).obj >> $@
$(MISC)/o_%.dpcc : $(MISC)/%.m
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(GUI)"=="UNX"
@echo $@ : $(OBJ)/$(<:b).obj >> $@
# dependency dummy for *.s files
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 5eb6dbf..a80ea33 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -38,10 +38,6 @@ force_dmake_to_error
# --- common tool makros --------------------------------------
-.IF "$(USE_PCH)"!=""
-ENABLE_PCH=TRUE
-.ENDIF # "$(USE_PCH)"!=""
-
.INCLUDE : unitools.mk
.INCLUDE : minor.mk
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 7fb14d3..a3231a6 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -99,10 +99,6 @@ CFLAGSCXX+=-Wno-deprecated-declarations
CFLAGSCXX += -D_GLIBCXX_DEBUG
.ENDIF # !PRODUCT
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
CFLAGSOBJGUIMT=
# Compiler flags for compiling static object in multi threaded environment with character user interface
@@ -268,4 +264,3 @@ RCSETVERSION=
# platform specific identifier for shared libs
DLLPRE=lib
DLLPOST=.so
-PCHPOST=.gch
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 06f1168..6ddb15a 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -106,8 +106,6 @@ LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
DLLPRE=lib
# We don't use dynamic shared libraries on iOS
DLLPOST=.a
-# Precompiled header file extension
-PCHPOST=.gch
STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
STDLIBGUIMT=$(STDLIBCUIMT)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 8471cee..b0c862e 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -132,11 +132,6 @@ CFLAGSDBGUTIL=
# Flag to specify output file to compiler/linker
CFLAGSOUTOBJ=-o
-# Flags to enable precompiled headers
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
# ---------------------------------
# Optimization flags
# ---------------------------------
@@ -216,8 +211,6 @@ LINKFLAGSOPT=
DLLPRE=lib
# File extension to identify dynamic shared libraries on MacOS X
DLLPOST=.dylib
-# Precompiled header file extension
-PCHPOST=.gch
# We don't use mapping on MacOS X
#LINKVERSIONMAPFLAG=-Wl,--version-script
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index d36bee6..6795d0f 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -55,10 +55,6 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
PICSWITCH:=
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
CFLAGSOBJGUIST=
CFLAGSOBJCUIST=
CFLAGSOBJGUIMT=-D_MT
@@ -169,8 +165,6 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-PCHPOST=.gch
-
ADVAPI32LIB=-ladvapi32
SHELL32LIB=-lshell32
GDI32LIB=-lgdi32
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 3c4bbf8..a86b78b 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -124,16 +124,6 @@ CFLAGS_NO_EXCEPTIONS=
CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
.ENDIF
-# with the current debug switches PCH won't work
-# anyway. so keep the existing .pch intact and don't
-# touch it
-.IF "$(debug)"!=""
-ENABLE_PCH:=
-.ENDIF "$(debug)"!=""
-
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
.IF "$(CALL_CDECL)"=="TRUE"
CFLAGSCALL=-Gd
.ELSE # "$(CALL_CDECL)"=="TRUE"
@@ -333,8 +323,6 @@ MT=mt.exe
MTFLAGS=$(NOLOGO)
-PCHPOST=.pch
-
CSC*=$(FLIPCMD) csc
VBC*=vbc
diff --git a/stoc/inc/makefile.mk b/stoc/inc/makefile.mk
index 11c064b..1fb6092 100644
--- a/stoc/inc/makefile.mk
+++ b/stoc/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/store/inc/makefile.mk b/store/inc/makefile.mk
index b9c077c..11f807d 100644
--- a/store/inc/makefile.mk
+++ b/store/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/testtools/inc/makefile.mk b/testtools/inc/makefile.mk
index 636cf52..26dc958 100644
--- a/testtools/inc/makefile.mk
+++ b/testtools/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk
index 1ed22ba..3e86b0a 100644
--- a/ucb/inc/makefile.mk
+++ b/ucb/inc/makefile.mk
@@ -37,12 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-.ENDIF # L10N_framework
diff --git a/udm/source/mkinc/fullcpp.mk b/udm/source/mkinc/fullcpp.mk
index 5faca9c..b87fd8d 100644
--- a/udm/source/mkinc/fullcpp.mk
+++ b/udm/source/mkinc/fullcpp.mk
@@ -31,9 +31,6 @@
# Has to be included AFTER settings.mk !
-# Precompiled header:
-
-
.IF "$(GUI)"=="WNT"
# RTTI
@@ -41,19 +38,6 @@
CFLAGS+= -GR
.ENDIF
-.IF "$(NP_LOCALBUILD)"!=""
-
-
-# Precompiled Headers
-PCH_NAME= udm
-.IF "$(DBG_LEVEL)"<"2"
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
-.ENDIF
-
-.ENDIF
-
.ENDIF
# Or should we simple check for $(COM)==GCC ?
diff --git a/xmerge/inc/makefile.mk b/xmerge/inc/makefile.mk
index ed1c6f3..4388dd4 100644
--- a/xmerge/inc/makefile.mk
+++ b/xmerge/inc/makefile.mk
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
index d75d361..7bf85a3 100755
--- a/xmlhelp/inc/makefile.mk
+++ b/xmlhelp/inc/makefile.mk
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
commit 992757cc5ebfb1df42636b8d3269cdbc10fc4148
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Nov 27 11:49:38 2011 -0600
remove pre-compiled header support in gbuild and gbuildified module
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk
index e9ae6f1..95cecc8 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 0d782c7..98ae557 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 263b8f1..998069e 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 00b7ace..130538e 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 eb21f5d..1448042 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 b1badf4..887917a 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 50608d4..d8898ec 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 25f3d92..7019977 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 b48ff08..de32da9 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 ac79fee..e66cce0 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 7c9960b..c0bb2bf 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 f1f73ce..5ed414e 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 f6a1a42..b5d82f6 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 972a0c2..3bd0a3b 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 23dc13a..05325e7 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 6493829..b69a1f5 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 0d46396..b9bea33 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 e4e6654..29bb82b 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 b8eadad..03d25cf 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 cd9edf1..d025a71 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 d9ae7ea..b70c89b 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 864b492..6fa3902 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 6c645c9..7fe78fc 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 0808896..e5bcf4a 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 6983370..c0dc56c 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 f62a102..0e2fd0c 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 ee51500..3e9f1aa 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 3fa9e68..7c19cbe 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 63623cf..3201988 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 3259cc1..5962fc7 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 14e6487..3be02bc 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 401e557..fbf06e4 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 e8296e7..6413cd7 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 1b649d8..98e6ff3 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 365c435..3056d25 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 776b84f..9db8c9a 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 aebdc12..2587e42 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 cd88fb9..ce29bde 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 2c18e26..ab4e9e3 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 f1fe830..02e14f8 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 d40f4a4..7ad007c 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 ee73509..fe127ad 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 3703f8c..53d63c3 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 60cc182..ae9f43a 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 0b3c541..dd6d2f1 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 83172b9..0e69117 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 aac204c..5f573c1 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 006c7a9..f705083 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 6d54c61..8890a6a 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 15ac285..88bd315 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 f65d7a8..ada2292 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 89464da..e6b3aab 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 5aa3e71..5a80814 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 340a754..9c18b53 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 91ec3b0..377c6a8 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 c14dcf3..8017ffb 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 89716f3..01444bd 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 fde1aa0..d606b8c 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 1cfb921..339206c 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 e03d8b0..8ba1dbb 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 4fe66e9..9a332e1 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 ca60325..262d5d1 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 93f2483..2230fe5 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 e15117e..4e96ab7 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 4e062f5..412107a 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 b5953b6..97fde5a 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 1bf7508..348acb5 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 ba5cae5..ee47e5d 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 d5bf09c..94bdbd1 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 8479881..2559391 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 3f36f55..7d86b77 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 50a28ed..c37de43 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 05a760a..1e7dcd0 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 4a0cdb8..7a1f555 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 95a914c..24a674e 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 1fcb2b4..a45c239 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 ce7e0c7..b14c701 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 cff2975..4df3819 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 1038c58..c25b15d 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 b030ad2..b39d05c 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 258734b..5a88b8b 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 ef908ca..ace2b99 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 16ed0dc..4a8d877 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 28d8e60..c5787d6 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 1c70a31..0d8c0a4 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 9d53091..17250d0 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 08c8c8a..73b515d 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 d4f8c35..be907a7 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 4305fe2..0a048a9 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 ca66a9e..dfee2ab 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 15db2b9..ba97750 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 cb7a8e0..f7888e9 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 2585984..afae72e 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 786e742..60841a0 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 7c55ec0..82daae1 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 96d5cc7..c094bb4 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
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list