sal: get rid of CustomTarget_generated.mk

Change-Id: I2347f60ef922d32201beda47e59e0b345d07a3b1

3 files changed, 3 insertions, 48 deletions

diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
deleted file mode 100644
index 8b35da707891..000000000000
--- a/sal/CustomTarget_generated.mk
+++ /dev/null
@@ -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:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index b683275eb06b..b5c84b1e0270 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -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) \
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
index 9d013e304414..af36a1066949 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/ZipPackage_sal_generated.mk
@@ -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: