diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-07-04 10:50:27 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-10 14:46:46 +0100 |
commit | 749870656d91d11bca846a9e99c1977068230e5d (patch) | |
tree | f181b9c21c699b181f1e329a78f5b84ef8ba3c40 | |
parent | 7ad8aefc283a98be18d3c0b0aec8751227268c6b (diff) |
rename to gb_Library_set_precompiled_header
There can be only one precompiled header with some compilers anyway.
Change-Id: I59e84bee2f57f36753b59b7518d701573affac12
-rw-r--r-- | sal/Library_sal.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 11 | ||||
-rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/templates/Library.mk | 2 | ||||
-rw-r--r-- | xmloff/Library_xo.mk | 2 |
8 files changed, 15 insertions, 6 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index b2504f922c84..a2139f4c7d9b 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_packages,sal,\ sal_inc \ )) -$(eval $(call gb_Library_add_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal)) +$(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal)) $(eval $(call gb_Library_set_include,sal,\ $$(INCLUDE) \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index f3efee4cc6aa..74a58763b085 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -353,6 +353,7 @@ $(eval $(foreach method,\ add_package_headers \ use_package \ use_packages \ + set_precompiled_header \ add_precompiled_header \ add_sdi_headers \ add_cflags \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index a9c7d8e3a101..e34de00dd43c 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -138,6 +138,7 @@ $(eval $(foreach method,\ use_packages \ use_unpacked \ add_sdi_headers \ + set_precompiled_header \ add_precompiled_header \ add_nativeres \ set_warnings_not_errors \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 0218f36122b0..6b22f0b13840 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -223,6 +223,7 @@ $(eval $(foreach method,\ use_unpacked \ add_package_headers \ add_sdi_headers \ + set_precompiled_header \ add_precompiled_header \ export_objects_list \ add_nativeres \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index ef671f6979bf..c4512a6d8a1b 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1185,7 +1185,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTa endef -define gb_LinkTarget__add_precompiled_header_impl +define gb_LinkTarget__set_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 @@ -1214,13 +1214,18 @@ endif endef -define gb_LinkTarget_add_precompiled_header +define gb_LinkTarget_set_precompiled_header ifeq ($(gb_ENABLE_PCH),$(true)) -$(call gb_LinkTarget__add_precompiled_header_impl,$(1),$(2),$(notdir $(2))) +$(call gb_LinkTarget__set_precompiled_header_impl,$(1),$(2),$(notdir $(2))) endif endef +define gb_LinkTarget_add_precompiled_header +$$(call gb_Output_error,\ + gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.) +endef + define gb_LinkTarget_add_external_headers $$(call gb_Output_error,\ gb_LinkTarget_add_external_headers: use gb_LinkTarget_use_package instead.) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index ad7cc829d36d..65e77b800d82 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -118,6 +118,7 @@ $(eval $(foreach method,\ use_external_project \ use_static_libraries \ add_sdi_headers \ + set_precompiled_header \ add_precompiled_header \ set_warnings_not_errors \ set_generated_cxx_suffix \ diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk index 615a82bcfd74..314f96656d39 100644 --- a/solenv/gbuild/templates/Library.mk +++ b/solenv/gbuild/templates/Library.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_package,LIB,MODULE_TYPE)) # for platforms supporting PCH: declare the location of the pch file # this is the name of the cxx file (without extension) -$(eval $(call gb_Library_add_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE)) +$(eval $(call gb_Library_set_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE)) # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE)) diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 89ccb206e1de..694c072a7329 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) $(eval $(call gb_Library_use_package,xo,xmloff_inc)) -$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff)) +$(eval $(call gb_Library_set_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff)) $(eval $(call gb_Library_set_include,xo,\ -I$(SRCDIR)/xmloff/inc/pch \ |