[Libreoffice-commits] .: 5 commits - Library_merged.mk packimages/CustomTarget_images.mk scp2/InstallModule_accessories.mk scp2/InstallModule_activex.mk scp2/InstallModule_base.mk scp2/InstallModule_binfilter.mk scp2/InstallModule_calc.mk scp2/InstallModule_canvas.mk scp2/InstallModule_crashrep.mk scp2/InstallModule_draw.mk scp2/InstallModule_extensions.mk scp2/InstallModule_gnome.mk scp2/InstallModule_graphicfilter.mk scp2/InstallModule_impress.mk scp2/InstallModule_javafilter.mk scp2/InstallModule_kde.mk scp2/InstallModule_math.mk scp2/InstallModule_onlineupdate.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk scp2/InstallModule_quickstart.mk scp2/InstallModule_sdkoo.mk scp2/InstallModule_smoketest.mk scp2/InstallModule_stdlibs.mk scp2/InstallModule_tde.mk scp2/InstallModule_ure.mk scp2/InstallModule_ure_standalone.mk scp2/InstallModule_windows.mk scp2/InstallModule_winexplorerext.mk scp2/InstallModule_writer.mk scp2/InstallModule_xsltfilter.mk scp2/Module_scp2.mk scp2/Package_ inc.mk scp2/Package_langmacros.mk solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 19 12:08:24 PDT 2012
Library_merged.mk | 1
packimages/CustomTarget_images.mk | 4 +-
scp2/InstallModule_accessories.mk | 5 ---
scp2/InstallModule_activex.mk | 5 ---
scp2/InstallModule_base.mk | 5 ---
scp2/InstallModule_binfilter.mk | 5 ---
scp2/InstallModule_calc.mk | 5 ---
scp2/InstallModule_canvas.mk | 5 ---
scp2/InstallModule_crashrep.mk | 5 ---
scp2/InstallModule_draw.mk | 5 ---
scp2/InstallModule_extensions.mk | 5 ---
scp2/InstallModule_gnome.mk | 5 ---
scp2/InstallModule_graphicfilter.mk | 5 ---
scp2/InstallModule_impress.mk | 5 ---
scp2/InstallModule_javafilter.mk | 5 ---
scp2/InstallModule_kde.mk | 5 ---
scp2/InstallModule_math.mk | 5 ---
scp2/InstallModule_onlineupdate.mk | 5 ---
scp2/InstallModule_ooo.mk | 5 ---
scp2/InstallModule_python.mk | 5 ---
scp2/InstallModule_quickstart.mk | 5 ---
scp2/InstallModule_sdkoo.mk | 5 ---
scp2/InstallModule_smoketest.mk | 5 ---
scp2/InstallModule_stdlibs.mk | 5 ---
scp2/InstallModule_tde.mk | 5 ---
scp2/InstallModule_ure.mk | 5 ---
scp2/InstallModule_ure_standalone.mk | 5 ---
scp2/InstallModule_windows.mk | 5 ---
scp2/InstallModule_winexplorerext.mk | 5 ---
scp2/InstallModule_writer.mk | 5 ---
scp2/InstallModule_xsltfilter.mk | 5 ---
scp2/Module_scp2.mk | 2 -
scp2/Package_inc.mk | 32 ----------------------
scp2/Package_langmacros.mk | 32 ----------------------
solenv/gbuild/AllLangResTarget.mk | 10 +------
solenv/gbuild/InstallModule.mk | 37 --------------------------
solenv/gbuild/InstallModuleTarget.mk | 45 ++++----------------------------
solenv/gbuild/InstallScript.mk | 6 +++-
solenv/gbuild/InternalUnoApi.mk | 6 ----
solenv/gbuild/TargetLocations.mk | 3 --
solenv/gbuild/platform/IOS_ARM_GCC.mk | 5 ---
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5 ---
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 ---
solenv/gbuild/platform/macosx.mk | 5 ---
solenv/gbuild/platform/solaris.mk | 5 ---
solenv/gbuild/platform/unxgcc.mk | 5 ---
46 files changed, 17 insertions(+), 336 deletions(-)
New commits:
commit d4ef17ab1c596adfcd39dff3a78d6032d5fde02f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Sep 19 20:48:47 2012 +0200
libmerged: use external cups
Change-Id: I1380fe8053ddf68a81b1bf6ffc8febfbb5ed9214
diff --git a/Library_merged.mk b/Library_merged.mk
index 39ed587..c08fb9f 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
$(eval $(call gb_Library_use_externals,merged,\
+ cups \
icui18n \
icule \
icuuc \
commit cce1368dc1c3af6b18c033694700f66d81ec0be5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Aug 25 13:19:26 2012 +0200
do not copy these xml files into solver
Change-Id: I92822085a65a179764b307b1344b09057e1d3b04
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index a32984f..e01e2fd 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -113,12 +113,6 @@ endef
define gb_InternalUnoApi_set_xmlfile
$(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2))
-$(call gb_Package_Package_internal,$(1)_xml,$(SRCDIR))
-$(call gb_Package_add_file,$(1)_xml,xml/$(notdir $(2)),$(2))
-$(call gb_InternalUnoApi_get_target,$(1)) :| \
- $(call gb_Package_get_target,$(1)_xml)
-$(call gb_InternalUnoApi_get_clean_target,$(1)) : \
- $(call gb_Package_get_clean_target,$(1)_xml)
endef
commit dae269b5697287c7ffd57b1cb4c80b0560bc618e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Aug 21 23:27:13 2012 +0200
do not copy .ilst files into solver
Change-Id: Ib192d827ba0bcffc6e9dbca37d9af5f2d0dd3939
diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk
index 5521694..c899288 100644
--- a/packimages/CustomTarget_images.mk
+++ b/packimages/CustomTarget_images.mk
@@ -45,7 +45,7 @@ $(packimages_DIR)/images.zip : \
$(call gb_Helper_abbreviate_dirs, \
$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \
- -l $(packimages_DIR) -l $(OUTDIR)/res/img -s $< -o $@ \
+ -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
$(packimages_DIR)/images_%.zip : \
@@ -55,7 +55,7 @@ $(packimages_DIR)/images_%.zip : \
$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \
$(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \
- -l $(packimages_DIR) -l $(OUTDIR)/res/img -s $< -o $@ \
+ -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
# make sure to have one to keep packing happy
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index e7703df..27ac952 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -321,7 +321,7 @@ gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/
$(call gb_ResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RES,2)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
+ rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCTARGET)
@@ -350,9 +350,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
rm -f $${RESPONSEFILE})
$(call gb_ResTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@) && \
- $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
+ $(call gb_Deliver_deliver,$<,$@)
define gb_ResTarget_ResTarget
$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
@@ -363,11 +361,7 @@ $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clea
$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
-$(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
-$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| \
- $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 94daaad..2451e07 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -49,7 +49,6 @@ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
gb_InternalUnoApi_get_target = $(OUTDIR)/rdb/$(1).rdb
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
-gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb
commit 764f0e9a5552336cb7fc5fdf9d6108d9f3640df7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Aug 21 22:01:36 2012 +0200
there is no ScpTarget dep target used
Change-Id: I3b648b67a884b03611311ea013910cfeb672b2dc
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 379baef..2a11c05 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -178,8 +178,6 @@ endef
gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl
gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET)
-gb_ScpTarget_DEPTARGET := $(call gb_Executable_get_target_for_build,makedepend)
-gb_ScpTarget_DEPCOMMAND := $(gb_Helper_set_ld_path) $(gb_ScpTarget_DEPTARGET)
define gb_ScpTarget__command
$(call gb_Output_announce,$(2),$(true),SCP,2)
@@ -203,27 +201,6 @@ $(call gb_ScpTarget_get_clean_target,%) :
rm -f \
$(call gb_ScpTarget_get_target,$*) \
$(call gb_ScpTarget_get_external_target,$*) \
- $(call gb_ScpTarget_get_dep_target,$*)
-
-ifneq ($(gb_FULLDEPS),)
-
-define gb_ScpTarget__command_dep
-$(call gb_Output_announce,SCP:$(2),$(true),DEP,2)
-$(call gb_Helper_abbreviate_dirs,\
- $(gb_ScpTarget_DEPCOMMAND) \
- $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
- -f $(1) \
- -p \
-)
-endef
-
-$(dir $(call gb_ScpTarget_get_dep_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_ScpTarget_get_dep_target,%) :
- $(call gb_ScpTarget__command_dep,$@,$*)
-
-endif
# gb_ScpTarget_ScpTarget(<target>)
define gb_ScpTarget_ScpTarget
@@ -236,10 +213,6 @@ $(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(call gb_ScpTarget_get_extern
$(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpPreprocessTarget_get_clean_target,$(1))
$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(gb_Helper_PHONY)
-ifneq ($(gb_FULLDEPS),)
-$(call gb_ScpTarget_get_dep_target,$(1)) :| $(dir $(call gb_ScpTarget_get_dep_target,$(1))).dir
-endif
-
endef
define gb_ScpTarget_set_localized
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 39c4112..94daaad 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -265,7 +265,6 @@ $(eval $(call gb_Helper_make_dep_targets,\
GenCObject \
GenCxxObject \
LinkTarget \
- ScpTarget \
SdiTarget \
SrsPartTarget \
SrsTarget \
commit 69a98d23e4a55a88bc15225dbac778e42e7b0021
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Aug 21 21:34:46 2012 +0200
gbuild: avoid unnecessary Packages while processing scp2 files
This is first in do-not-duplicate-stuff-in-solver patch series.
Adds direct include path for gb_ScpPreprocessTarget.
Avoids copying .par files by using gb_InstallScriptTarget__get_dirs
for include paths.
Change-Id: I0a2b76accbbe7f33c83816fb8ad69cc29590e9e2
diff --git a/scp2/InstallModule_accessories.mk b/scp2/InstallModule_accessories.mk
index d9df0df..50b6511 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 91f9094..379542f 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 294ad60..9ad40a3 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 432ab46..c6ee85c 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 b99f8f1..c1e1fcc 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 4e4820c..0b47eb6 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 1da89b4..1762d69 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 7bf9e56..12083fb 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 ad2ae31..996d116 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 15e8116..7d9438b 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 0fdd21a..660aef7 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 bbe461e..a319beb 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 1e7f541..117f598 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 84cbef7..6c4ca2a 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 c83d7c6..022f7b9 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 3305223..ff03d23 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 42fab0e..5ca6b6c 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 9a2004b..32516b3 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 0beaeb9..bc23a75 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 c862f30..a41ec03 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 09e37ea..6038374 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 9929c51..5f6c171 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 e20e390..6017aac 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 99594c1..4a5d9cd 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 7def7b7..ef93ef6 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 e81a209..813bd69 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 1c3b9fb..745b38a 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 bbaf00a..7306f8c 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 a3fba1b..9bc4735 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 c621cc5..95b1df2 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 ff88ef0..0000000
--- 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 at 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 842b92d..0000000
--- 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 at 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 7ff5a9e..cb37a49 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 3d7fcd0..379baef 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 35ea142..c325d4b 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 a0fa050..39c4112 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 878d9f3..ebe64d1 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 a682c5f..f92a278 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 2b9bae7..2299980 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 d2852df..3d6810b 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 993c97e..1ecc970 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 4938d95..e6ed9e3 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
More information about the Libreoffice-commits
mailing list