diff options
42 files changed, 12 insertions, 291 deletions
diff --git a/scp2/InstallModule_accessories.mk b/scp2/InstallModule_accessories.mk index d9df0df4c042..50b65112d28e 100644 --- a/scp2/InstallModule_accessories.mk +++ b/scp2/InstallModule_accessories.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/accessories)) -$(eval $(call gb_InstallModule_use_packages,scp2/accessories,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ scp2/source/accessories/module_accessories \ )) diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk index 91f9094f2c8e..379542f06aeb 100644 --- a/scp2/InstallModule_activex.mk +++ b/scp2/InstallModule_activex.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/activex)) -$(eval $(call gb_InstallModule_use_packages,scp2/activex,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/activex,\ BUILD_X64 \ )) diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index 294ad60ecbdf..9ad40a329a44 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) -$(eval $(call gb_InstallModule_use_packages,scp2/base,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/base,\ ENABLE_REPORTBUILDER \ )) diff --git a/scp2/InstallModule_binfilter.mk b/scp2/InstallModule_binfilter.mk index 432ab466378d..c6ee85cff875 100644 --- a/scp2/InstallModule_binfilter.mk +++ b/scp2/InstallModule_binfilter.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/binfilter)) -$(eval $(call gb_InstallModule_use_packages,scp2/binfilter,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/binfilter,\ scp2/source/binfilter/file_binfilter \ )) diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index b99f8f1fed7f..c1e1fccfb187 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/calc)) -$(eval $(call gb_InstallModule_use_packages,scp2/calc,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ SYSTEM_LPSOLVE \ )) diff --git a/scp2/InstallModule_canvas.mk b/scp2/InstallModule_canvas.mk index 4e4820c43e85..0b47eb6141d0 100644 --- a/scp2/InstallModule_canvas.mk +++ b/scp2/InstallModule_canvas.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/canvas)) -$(eval $(call gb_InstallModule_use_packages,scp2/canvas,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/canvas,\ scp2/source/canvas/canvascommons \ scp2/source/canvas/mtfrenderer \ diff --git a/scp2/InstallModule_crashrep.mk b/scp2/InstallModule_crashrep.mk index 1da89b4ecf24..1762d6951a28 100644 --- a/scp2/InstallModule_crashrep.mk +++ b/scp2/InstallModule_crashrep.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/crashrep)) -$(eval $(call gb_InstallModule_use_packages,scp2/crashrep,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/crashrep,\ scp2/source/crashrep/file_crashrep \ )) diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk index 7bf9e56a4468..12083fb897ff 100644 --- a/scp2/InstallModule_draw.mk +++ b/scp2/InstallModule_draw.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/draw)) -$(eval $(call gb_InstallModule_use_packages,scp2/draw,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_templates,scp2/draw,\ scp2/source/templates/module_langpack_draw \ )) diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk index ad2ae3153564..996d11640b8a 100644 --- a/scp2/InstallModule_extensions.mk +++ b/scp2/InstallModule_extensions.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/extensions)) -$(eval $(call gb_InstallModule_use_packages,scp2/extensions,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\ SYSTEM_BSH \ SYSTEM_RHINO \ diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 15e811688126..7d9438bcc5a7 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome)) -$(eval $(call gb_InstallModule_use_packages,scp2/gnome,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ ENABLE_EVOAB2 \ ENABLE_GCONF \ diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index 0fdd21ad1e06..660aef747a60 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) -$(eval $(call gb_InstallModule_use_packages,scp2/graphicfilter,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/file_graphicfilter \ )) diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index bbe461ef1da4..a319beb83f86 100644 --- a/scp2/InstallModule_impress.mk +++ b/scp2/InstallModule_impress.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress)) -$(eval $(call gb_InstallModule_use_packages,scp2/impress,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\ ENABLE_OPENGL \ )) diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk index 1e7f541b9251..117f598e393c 100644 --- a/scp2/InstallModule_javafilter.mk +++ b/scp2/InstallModule_javafilter.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/javafilter)) -$(eval $(call gb_InstallModule_use_packages,scp2/javafilter,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\ scp2/source/javafilter/file_javafilter \ )) diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk index 84cbef7367d9..6c4ca2a65f83 100644 --- a/scp2/InstallModule_kde.mk +++ b/scp2/InstallModule_kde.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/kde)) -$(eval $(call gb_InstallModule_use_packages,scp2/kde,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/kde,\ ENABLE_KDE \ ENABLE_KDE4 \ diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk index c83d7c618bb5..022f7b93569e 100644 --- a/scp2/InstallModule_math.mk +++ b/scp2/InstallModule_math.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/math)) -$(eval $(call gb_InstallModule_use_packages,scp2/math,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_templates,scp2/math,\ scp2/source/templates/module_langpack_math \ )) diff --git a/scp2/InstallModule_onlineupdate.mk b/scp2/InstallModule_onlineupdate.mk index 3305223e27a4..ff03d231bc2e 100644 --- a/scp2/InstallModule_onlineupdate.mk +++ b/scp2/InstallModule_onlineupdate.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/onlineupdate)) -$(eval $(call gb_InstallModule_use_packages,scp2/onlineupdate,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\ scp2/source/onlineupdate/file_onlineupdate \ )) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 42fab0ed5de3..5ca6b6c97408 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ooo)) -$(eval $(call gb_InstallModule_use_packages,scp2/ooo,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ DISABLE_ATL \ DISABLE_NEON \ diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 9a2004b405ec..32516b3117b7 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) -$(eval $(call gb_InstallModule_use_packages,scp2/python,\ - scp2_inc \ - scp2_langmacros \ -)) - ifeq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DDISABLE_PYUNO \ diff --git a/scp2/InstallModule_quickstart.mk b/scp2/InstallModule_quickstart.mk index 0beaeb9da8c8..bc23a75881bb 100644 --- a/scp2/InstallModule_quickstart.mk +++ b/scp2/InstallModule_quickstart.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/quickstart)) -$(eval $(call gb_InstallModule_use_packages,scp2/quickstart,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/quickstart,\ scp2/source/quickstart/file_quickstart \ scp2/source/quickstart/registryitem_quickstart \ diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk index c862f3081c16..a41ec03f8b14 100644 --- a/scp2/InstallModule_sdkoo.mk +++ b/scp2/InstallModule_sdkoo.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo)) -$(eval $(call gb_InstallModule_use_packages,scp2/sdkoo,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\ scp2/source/sdkoo/sdkoo \ )) diff --git a/scp2/InstallModule_smoketest.mk b/scp2/InstallModule_smoketest.mk index 09e37eaa0266..603837449232 100644 --- a/scp2/InstallModule_smoketest.mk +++ b/scp2/InstallModule_smoketest.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/smoketest)) -$(eval $(call gb_InstallModule_use_packages,scp2/smoketest,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/smoketest,\ scp2/source/smoketest/smoketest \ )) diff --git a/scp2/InstallModule_stdlibs.mk b/scp2/InstallModule_stdlibs.mk index 9929c51925fa..5f6c171834aa 100644 --- a/scp2/InstallModule_stdlibs.mk +++ b/scp2/InstallModule_stdlibs.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/stdlibs)) -$(eval $(call gb_InstallModule_use_packages,scp2/stdlibs,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/stdlibs,\ scp2/source/stdlibs/file_stdlibs \ )) diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk index e20e390bc6f6..6017aacab1ca 100644 --- a/scp2/InstallModule_tde.mk +++ b/scp2/InstallModule_tde.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/tde)) -$(eval $(call gb_InstallModule_use_packages,scp2/tde,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\ ENABLE_TDE \ ENABLE_TDEAB \ diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk index 99594c1f7641..4a5d9cdd56b4 100644 --- a/scp2/InstallModule_ure.mk +++ b/scp2/InstallModule_ure.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ure)) -$(eval $(call gb_InstallModule_use_packages,scp2/ure,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\ SYSTEM_LIBXML \ )) diff --git a/scp2/InstallModule_ure_standalone.mk b/scp2/InstallModule_ure_standalone.mk index 7def7b7a4284..ef93ef619424 100644 --- a/scp2/InstallModule_ure_standalone.mk +++ b/scp2/InstallModule_ure_standalone.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ure_standalone)) -$(eval $(call gb_InstallModule_use_packages,scp2/ure_standalone,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/ure_standalone,\ scp2/source/ooo/ure_standalone \ )) diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk index e81a209ca93e..813bd699b53c 100644 --- a/scp2/InstallModule_windows.mk +++ b/scp2/InstallModule_windows.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/windows)) -$(eval $(call gb_InstallModule_use_packages,scp2/windows,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/windows,\ BUILD_X64 \ )) diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk index 1c3b9fbd07e7..745b38adb6ef 100644 --- a/scp2/InstallModule_winexplorerext.mk +++ b/scp2/InstallModule_winexplorerext.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/winexplorerext)) -$(eval $(call gb_InstallModule_use_packages,scp2/winexplorerext,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\ BUILD_X64 \ )) diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk index bbaf00a5a0c1..7306f8c617d7 100644 --- a/scp2/InstallModule_writer.mk +++ b/scp2/InstallModule_writer.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/writer)) -$(eval $(call gb_InstallModule_use_packages,scp2/writer,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_templates,scp2/writer,\ scp2/source/templates/module_langpack_writer \ )) diff --git a/scp2/InstallModule_xsltfilter.mk b/scp2/InstallModule_xsltfilter.mk index a3fba1b031f8..9bc4735b588e 100644 --- a/scp2/InstallModule_xsltfilter.mk +++ b/scp2/InstallModule_xsltfilter.mk @@ -27,11 +27,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/xsltfilter)) -$(eval $(call gb_InstallModule_use_packages,scp2/xsltfilter,\ - scp2_inc \ - scp2_langmacros \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\ scp2/source/xsltfilter/file_xsltfilter \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index c621cc523db2..95b1df2ce429 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallScript_sdkoo \ InstallScript_setup_osl \ InstallScript_test \ - Package_inc \ - Package_langmacros \ $(if $(filter WNT,$(GUI)),\ InstallModule_activex \ InstallModule_quickstart \ diff --git a/scp2/Package_inc.mk b/scp2/Package_inc.mk deleted file mode 100644 index ff88ef0730aa..000000000000 --- a/scp2/Package_inc.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,scp2_inc,$(SRCDIR)/scp2/inc)) - -$(eval $(call gb_Package_add_file,scp2_inc,inc/macros.inc,macros.inc)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/Package_langmacros.mk b/scp2/Package_langmacros.mk deleted file mode 100644 index 842b92df46a4..000000000000 --- a/scp2/Package_langmacros.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,scp2_langmacros,$(call gb_CustomTarget_get_workdir,scp2/macros))) - -$(eval $(call gb_Package_add_file,scp2_langmacros,inc/langmacros.inc,langmacros.inc)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk index 7ff5a9effff1..cb37a49625c4 100644 --- a/solenv/gbuild/InstallModule.mk +++ b/solenv/gbuild/InstallModule.mk @@ -40,23 +40,15 @@ $(call gb_InstallModule_get_clean_target,%) : define gb_InstallModule_InstallModule $(call gb_InstallModuleTarget_InstallModuleTarget,$(1)) -$(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1))) $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1)) -$(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par) $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1)) -$(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_par) $$(eval $$(call gb_Module_register_target,$(call gb_InstallModule_get_target,$(1)),$(call gb_InstallModule_get_clean_target,$(1)))) endef -define gb_InstallModule_set_include -$(call gb_InstallModuleTarget_set_include,$(1),$(2)) - -endef - define gb_InstallModule_add_defs $(call gb_InstallModuleTarget_add_defs,$(1),$(2)) @@ -77,52 +69,23 @@ $(call gb_InstallModuleTarget_define_mingw_dll_if_set,$(1),$(2)) endef -define gb_InstallModule_use_package -$(call gb_InstallModuleTarget_use_package,$(1),$(2)) - -endef - -define gb_InstallModule_use_packages -$(call gb_InstallModuleTarget_use_packages,$(1),$(2)) - -endef - -define gb_InstallModule__add_scpfile_impl -$(call gb_Package_add_file,$(1)_par,par/osl/$(notdir $(2)),$(2)) - -endef - -define gb_InstallModule__add_scpfile -$(call gb_InstallModule__add_scpfile_impl,$(1),$(dir $(2))$(notdir $(call gb_ScpTarget_get_target,$(2)))) - -endef - -define gb_InstallModule__add_scpfiles -$(foreach scpfile,$(2),$(call gb_InstallModule__add_scpfile,$(1),$(scpfile))) - -endef - define gb_InstallModule_add_scpfile $(call gb_InstallModuleTarget_add_scpfile,$(1),$(2)) -$(call gb_InstallModule__add_scpfile,$(1),$(2)) endef define gb_InstallModule_add_scpfiles $(call gb_InstallModuleTarget_add_scpfiles,$(1),$(2)) -$(call gb_InstallModule__add_scpfiles,$(1),$(2)) endef define gb_InstallModule_add_localized_scpfile $(call gb_InstallModuleTarget_add_localized_scpfile,$(1),$(2)) -$(call gb_InstallModule__add_scpfile,$(1),$(2)) endef define gb_InstallModule_add_localized_scpfiles $(call gb_InstallModuleTarget_add_localized_scpfiles,$(1),$(2)) -$(call gb_InstallModule__add_scpfiles,$(1),$(2)) endef diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 3d7fcd02ac89..379baefb7882 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -212,7 +212,6 @@ $(call gb_Output_announce,SCP:$(2),$(true),DEP,2) $(call gb_Helper_abbreviate_dirs,\ $(gb_ScpTarget_DEPCOMMAND) \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ - $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ -f $(1) \ -p \ ) @@ -295,18 +294,14 @@ $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \ $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_FILES := $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS := -$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := +$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := -I$(SRCDIR)/scp2/inc $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_TEMPLATE_INCLUDE := +$(call gb_InstallModuleTarget_use_custom_headers,$(1),scp2/macros) $(call gb_InstallModuleTarget_InstallModuleTarget_platform,$(1)) endef -define gb_InstallModuleTarget_set_include -$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := $(2) - -endef - define gb_InstallModuleTarget_add_defs $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS += $(2) @@ -333,13 +328,14 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ endef -define gb_InstallModuleTarget_use_package -$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_Package_get_target,$(2)) +define gb_InstallModuleTarget_use_custom_header +$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_CustomTarget_get_target,$(2)) +$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) \ endef -define gb_InstallModuleTarget_use_packages -$(foreach package,$(2),$(call gb_InstallModuleTarget_use_package,$(1),$(package))) +define gb_InstallModuleTarget_use_custom_headers +$(foreach customtarget,$(2),$(call gb_InstallModuleTarget_use_custom_header,$(1),$(customtarget))) endef diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk index 35ea142ca147..c325d4bfa2be 100644 --- a/solenv/gbuild/InstallScript.mk +++ b/solenv/gbuild/InstallScript.mk @@ -36,6 +36,10 @@ define gb_InstallScriptTarget__get_files $(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module))))) endef +define gb_InstallScriptTarget__get_dirs +$(sort $(dir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))) +endef + # Pass first arg if make is running in silent mode, second arg otherwise define gb_InstallScriptTarget__if_silent $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2)) @@ -50,7 +54,7 @@ $(call gb_Helper_abbreviate_dirs,\ ) && \ $(gb_InstallScriptTarget_COMMAND) \ $(call gb_InstallScriptTarget__if_silent,-q) \ - -i $(OUTDIR)/par/osl \ + -i $(call gb_InstallScriptTarget__get_dirs,$(SCP_MODULES)) \ -o $(1) \ @@$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE} \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index a0fa050ca9fb..39c411234f90 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -102,7 +102,6 @@ gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist -gb_InstallModuleTarget_get_workdir = $(patsubst %/,%,$(dir $(call gb_ScpTarget_get_target,%))) gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT) gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar gb_Jar_get_classsetname = Jar/$(1) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 878d9f3650f1..ebe64d124482 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -304,11 +304,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) -$(call gb_InstallModuleTarget_set_include,$(1),\ - $(SOLARINC) \ - $(SCP_INCLUDE) \ -) - endef # ScpConvertTarget class diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index a682c5f76ad8..f92a278a71a8 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -441,11 +441,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) -$(call gb_InstallModuleTarget_set_include,$(1),\ - $(SOLARINC) \ - $(SCP_INCLUDE) \ -) - endef # ScpConvertTarget class diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 2b9bae7a198e..22999805b1f8 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -719,11 +719,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) -$(call gb_InstallModuleTarget_set_include,$(1),\ - $(SOLARINC) \ - $(SCP_INCLUDE) \ -) - endef # ScpConvertTarget class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index d2852dfdd289..3d6810bb184b 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -416,11 +416,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) -$(call gb_InstallModuleTarget_set_include,$(1),\ - $(SOLARINC) \ - $(SCP_INCLUDE) \ -) - endef # ScpConvertTarget class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 993c97e99bde..1ecc970d956a 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -413,11 +413,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) -$(call gb_InstallModuleTarget_set_include,$(1),\ - $(SOLARINC) \ - $(SCP_INCLUDE) \ -) - endef # ScpConvertTarget class diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 4938d95405f4..e6ed9e327443 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -415,11 +415,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) -$(call gb_InstallModuleTarget_set_include,$(1),\ - $(SOLARINC) \ - $(SCP_INCLUDE) \ -) - endef # ScpConvertTarget class |