diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-12 12:08:03 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-13 09:26:18 +0200 |
| commit | d3e93f256e5125b0948c89943b6c9bde6aa0d125 (patch) | |
| tree | b9a85ee99cf988cfb00785eadd0278c0c4f3fcf0 /solenv | |
| parent | ea09e0352a82dabc26c713adc1825d89ff824178 (diff) | |
install SDK headers from filelists
... which allows us to drop gb_ZipPackage.
Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/ZipPackage.mk | 47 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 |
3 files changed, 0 insertions, 49 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index d87287803e64..f56d9b24f4e1 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -235,7 +235,6 @@ gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1) gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1) gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done -gb_ZipPackage_get_target = $(WORKDIR)/ZipPackage/$(1) gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk deleted file mode 100644 index 612486c25e0e..000000000000 --- a/solenv/gbuild/ZipPackage.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -# ZipPackage class -# this is a bit of a hack, hopefully needed only temporarily because -# scp2 can easily deal with zip files but not so easily with 100s of -# individual files; ideally the Package itself should be sufficient. - -define gb_ZipPackage_ZipPackage -$(call gb_Package_Package,$(1),$(2)) -$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) -$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1)) -$(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) -$(call gb_ZipPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1)) -$(call gb_Helper_make_userfriendly_targets,$(1),ZipPackage) - -endef - -# sadly Package delivers to inc/ but ODK path is include/ so need to -# copy files twice -# $(1) package -# $(2) dir in package -# $(3) dir in zip -# $(4) file list -define gb_ZipPackage_add_files -$(call gb_Package_add_files,$(1),$(2),$(4)) -$(foreach file,$(4),$(call gb_Zip_add_file,$(1),$(3)/$(notdir $(file)),$(gb_Package_SOURCEDIR_$(1))/$(file))) - -endef - -# $(1) package -# $(2) file in package -# $(3) file in zip -# $(4) file source -define gb_ZipPackage_add_file -$(call gb_Package_add_file,$(1),$(2),$(4)) -$(call gb_Zip_add_file,$(1),$(3),$(gb_Package_SOURCEDIR_$(1))/$(4)) - -endef - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 3853618fc119..87a5c6570fb5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -331,7 +331,6 @@ include $(foreach class, \ CliNativeLibrary \ CliUnoApi \ Zip \ - ZipPackage \ AllLangPackage \ Configuration \ HelpTarget \ |