[Libreoffice-commits] core.git: 2 commits - mdds/UnpackedTarball_mdds.mk solenv/gbuild vigra/UnpackedTarball_vigra.mk
Michael Stahl
mstahl at redhat.com
Tue Apr 2 06:59:33 PDT 2013
mdds/UnpackedTarball_mdds.mk | 31 --------------
solenv/gbuild/UnpackedTarball.mk | 19 --------
vigra/UnpackedTarball_vigra.mk | 86 ---------------------------------------
3 files changed, 136 deletions(-)
New commits:
commit addfe6a68ca9e606c1796954e12621ae951180fc
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Apr 2 15:55:11 2013 +0200
gbuild: remove gb_UnpackedTarball_copy_header_files
... before somebody gets the bad idea of actually using it again.
No longer used in boost since a53586f4efe26b8875107d04001f4ecec760c343.
Change-Id: I41edb22ae8e7e36f40b24eb4479da874fb9a6c29
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index d201996..87c25a5 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -145,9 +145,6 @@ $(call gb_Helper_abbreviate_dirs,\
done && \
) \
$(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \
- $(if $(UNPACKED_SUBDIRS),\
- cp -rf $(UNPACKED_SUBDIRS) $(gb_EXTERNAL_HEADERS_DIR) && \
- ) \
$(if $(UNPACKED_POST_ACTION),\
$(UNPACKED_POST_ACTION) && \
) \
@@ -186,7 +183,6 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
$(call gb_UnpackedTarball_get_preparation_target,$*) \
$(call gb_UnpackedTarball_get_dir,$*) \
$(call gb_UnpackedTarball_get_pristine_dir,$*) \
- $(foreach subdir,$(UNPACKED_SUBDIRS),$(gb_EXTERNAL_HEADERS_DIR)/$(subdir)) \
)
define gb_UnpackedTarball__get_makefile
@@ -202,8 +198,6 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL :=
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := $(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
-$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_SUBDIRS :=
-$(call gb_UnpackedTarball_get_clean_target,$(1)) : UNPACKED_SUBDIRS :=
$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(call gb_UnpackedTarball__get_makefile)
$(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir
@@ -297,19 +291,6 @@ $(foreach file,$(3),$(call gb_UnpackedTarball_add_file,$(1),$(2)/$(notdir $(file
endef
-# Copy header files from the unpacked subdir(s) to solver
-#
-# Used for boost.
-# For other external headers, include path is added in RepositoryExternal.mk
-#
-# gb_UnpackedTarball_copy_header_files unpacked subdir(s)
-define gb_UnpackedTarball_copy_header_files
-$(call gb_UnpackedTarball_get_target,$(1)) :| $(gb_EXTERNAL_HEADERS_DIR)/.dir
-$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_SUBDIRS := $(2)
-$(call gb_UnpackedTarball_get_clean_target,$(1)) : UNPACKED_SUBDIRS := $(2)
-
-endef
-
# Set arbitrary shell command to be run during unpack
#
# The command is run at the very end: after patching, C++ extension
commit 29c853ca2cbbac0ca579a3c541d3d342c87ecd3e
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Apr 2 15:40:56 2013 +0200
mdds, vigra: drop obsolete gb_UnpackedTarball_mark_output_files
This is no longer necessary with concat-deps rewriting the dependencies.
Change-Id: Ie27cf575346879a3cc89b8024c86fd2958d672c6
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index 0f1de08..9764878 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -20,35 +20,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/wundef.patch \
))
-$(eval $(call gb_UnpackedTarball_mark_output_files,mdds,\
- include/mdds/compat/unique_ptr.hpp \
- include/mdds/default_deleter.hpp \
- include/mdds/flat_segment_tree.hpp \
- include/mdds/flat_segment_tree_def.inl \
- include/mdds/flat_segment_tree_itr.hpp \
- include/mdds/global.hpp \
- include/mdds/hash_container/map.hpp \
- include/mdds/mixed_type_matrix.hpp \
- include/mdds/mixed_type_matrix_def.inl \
- include/mdds/mixed_type_matrix_element.hpp \
- include/mdds/mixed_type_matrix_flag_storage.hpp \
- include/mdds/mixed_type_matrix_storage.hpp \
- include/mdds/mixed_type_matrix_storage_filled_linear.inl \
- include/mdds/mixed_type_matrix_storage_sparse.inl \
- include/mdds/multi_type_matrix.hpp \
- include/mdds/multi_type_matrix_def.inl \
- include/mdds/multi_type_vector.hpp \
- include/mdds/multi_type_vector_def.inl \
- include/mdds/multi_type_vector_itr.hpp \
- include/mdds/multi_type_vector_macro.hpp \
- include/mdds/multi_type_vector_trait.hpp \
- include/mdds/multi_type_vector_types.hpp \
- include/mdds/node.hpp \
- include/mdds/point_quad_tree.hpp \
- include/mdds/quad_node.hpp \
- include/mdds/rectangle_set.hpp \
- include/mdds/rectangle_set_def.inl \
- include/mdds/segment_tree.hpp \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/vigra/UnpackedTarball_vigra.mk b/vigra/UnpackedTarball_vigra.mk
index d6296c4..72e6209 100644
--- a/vigra/UnpackedTarball_vigra.mk
+++ b/vigra/UnpackedTarball_vigra.mk
@@ -18,90 +18,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,vigra,\
vigra/vigra1.4.0-enumwarn.patch \
))
-$(eval $(call gb_UnpackedTarball_mark_output_files,vigra,\
- include/vigra/accessor.hxx \
- include/vigra/array_vector.hxx \
- include/vigra/basicgeometry.hxx \
- include/vigra/basicimage.hxx \
- include/vigra/basicimageview.hxx \
- include/vigra/bordertreatment.hxx \
- include/vigra/boundarytensor.hxx \
- include/vigra/codec.hxx \
- include/vigra/colorconversions.hxx \
- include/vigra/combineimages.hxx \
- include/vigra/config.hxx \
- include/vigra/contourcirculator.hxx \
- include/vigra/convolution.hxx \
- include/vigra/copyimage.hxx \
- include/vigra/cornerdetection.hxx \
- include/vigra/diff2d.hxx \
- include/vigra/distancetransform.hxx \
- include/vigra/edgedetection.hxx \
- include/vigra/eigensystem.hxx \
- include/vigra/error.hxx \
- include/vigra/fftw.hxx \
- include/vigra/fftw3.hxx \
- include/vigra/fixedpoint.hxx \
- include/vigra/flatmorphology.hxx \
- include/vigra/functorexpression.hxx \
- include/vigra/functortraits.hxx \
- include/vigra/gaborfilter.hxx \
- include/vigra/gaussians.hxx \
- include/vigra/gradient_energy_tensor.hxx \
- include/vigra/imagecontainer.hxx \
- include/vigra/imageinfo.hxx \
- include/vigra/imageiterator.hxx \
- include/vigra/imageiteratoradapter.hxx \
- include/vigra/impex.hxx \
- include/vigra/initimage.hxx \
- include/vigra/inspectimage.hxx \
- include/vigra/interpolating_accessor.hxx \
- include/vigra/iteratoradapter.hxx \
- include/vigra/iteratortags.hxx \
- include/vigra/iteratortraits.hxx \
- include/vigra/labelimage.hxx \
- include/vigra/linear_algebra.hxx \
- include/vigra/linear_solve.hxx \
- include/vigra/localminmax.hxx \
- include/vigra/mathutil.hxx \
- include/vigra/matrix.hxx \
- include/vigra/memory.hxx \
- include/vigra/metaprogramming.hxx \
- include/vigra/multi_array.hxx \
- include/vigra/multi_convolution.hxx \
- include/vigra/multi_impex.hxx \
- include/vigra/multi_iterator.hxx \
- include/vigra/multi_pointoperators.hxx \
- include/vigra/navigator.hxx \
- include/vigra/nonlineardiffusion.hxx \
- include/vigra/numerictraits.hxx \
- include/vigra/orientedtensorfilters.hxx \
- include/vigra/pixelneighborhood.hxx \
- include/vigra/polynomial.hxx \
- include/vigra/rational.hxx \
- include/vigra/recursiveconvolution.hxx \
- include/vigra/resampling_convolution.hxx \
- include/vigra/resizeimage.hxx \
- include/vigra/rfftw.hxx \
- include/vigra/rgbvalue.hxx \
- include/vigra/seededregiongrowing.hxx \
- include/vigra/separableconvolution.hxx \
- include/vigra/sized_int.hxx \
- include/vigra/splineimageview.hxx \
- include/vigra/splines.hxx \
- include/vigra/static_assert.hxx \
- include/vigra/stdconvolution.hxx \
- include/vigra/stdimage.hxx \
- include/vigra/stdimagefunctions.hxx \
- include/vigra/symmetry.hxx \
- include/vigra/tensorutilities.hxx \
- include/vigra/tiff.hxx \
- include/vigra/tinyvector.hxx \
- include/vigra/transformimage.hxx \
- include/vigra/tuple.hxx \
- include/vigra/utilities.hxx \
- include/vigra/watersheds.hxx \
- include/vigra/windows.h \
-))
-
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list