mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal: get rid of CustomTarget_generated.mk

Browse Source 
Change-Id: I2347f60ef922d32201beda47e59e0b345d07a3b1
This commit is contained in:
Michael Stahl
2013-02-27 15:20:27 +01:00
parent fdd44e2d6c
commit 960e2ee691
4 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
sal/CustomTarget_generated.mk
View File

@@ -1,44 +0,0 @@
# -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan@gmail.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_CustomTarget_CustomTarget,sal/generated))
sal_DIR := $(call gb_CustomTarget_get_workdir,sal/generated)
$(call gb_CustomTarget_get_target,sal/generated) : \
$(sal_DIR)/sal/udkversion.h \
$(if $(filter-out $(COM),MSC),$(sal_DIR)/sal/typesizes.h)
$(sal_DIR)/sal/typesizes.h :| $(sal_DIR)/sal/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
cp $(SRCDIR)/config_host/config_typesizes.h $@
$(sal_DIR)/sal/udkversion.h :| $(sal_DIR)/sal/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
cp $(SRCDIR)/config_host/config_udkversion.h $@
# vim: set noet sw=4 ts=4:

1
sal/Module_sal.mk
View File

@@ -29,7 +29,6 @@
$(eval $(call gb_Module_Module,sal))
$(eval $(call gb_Module_add_targets,sal,\
CustomTarget_generated \
CustomTarget_sal_allheaders \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
Executable_cppunittester) \

6
sal/ZipPackage_sal_generated.mk
View File

@@ -25,10 +25,10 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated)))
$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_host))
$(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/udkversion.h))
$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/udkversion.h,include/sal/udkversion.h,config_udkversion.h))
$(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/typesizes.h))
$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
# vim: set noet sw=4 ts=4:

10
solenv/gbuild/ZipPackage.mk
View File

@@ -37,4 +37,14 @@ $(foreach file,$(4),$(call gb_Zip_add_file,$(1),$(3)/$(notdir $(file)),$(gb_Pack
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: