officecfg: remove Package_cppheader

Instead include generated headers directly from workdir.

Change-Id: I9d2bcc07175d2bbc16d3cc548c2245e7a4fb0c65

4 files changed, 7 insertions, 21 deletions

diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk
index d1cdf92e9270..09a4932810e9 100644
--- a/officecfg/CppunitTest_officecfg_cppheader_test.mk
+++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_CppUnitTest_use_custom_headers,officecfg_cppheader_test,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \
     officecfg/qa/cppheader \
 ))
@@ -21,6 +25,4 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_package,officecfg_cppheader_test,officecfg_cppheader))
-
 # vim: set noet sw=4 ts=4:
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index aaf6f16089b2..a482585d0323 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
 
 $(call gb_CustomTarget_get_target,officecfg/registry) : \
 	$(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\
-		$(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx)
+		$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/$(i).hxx)
 
 # auto generated header file for unit test qa/cppheader.cxx
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.hxx: \
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_allheaders.hxx: \
 		$(SRCDIR)/officecfg/files.mk
 	$(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1)
 	mkdir -p $(dir $@) && \
@@ -25,7 +25,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.h
 # pass the stem as space separated path elements and get a set of --stringparam ns<level> <element> in return
 officecfg_xsltparams=$(if $(filter-out $(lastword $1),$1),$(call officecfg_xsltparams,$(filter-out $(lastword $1),$1))) --stringparam ns$(words $1) $(lastword $1)
 
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/%.hxx: \
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/%.hxx: \
             $(SRCDIR)/officecfg/registry/schema/org/openoffice/%.xcs \
             $(SRCDIR)/officecfg/registry/cppheader.xsl\
 	    | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
index 6e526e98dfbc..0e1e94396e96 100644
--- a/officecfg/Module_officecfg.mk
+++ b/officecfg/Module_officecfg.mk
@@ -22,7 +22,6 @@ include $(SRCDIR)/officecfg/files.mk
 
 $(eval $(call gb_Module_add_targets,officecfg,\
     CustomTarget_registry \
-    Package_cppheader \
     Package_misc \
     Package_tools \
     Configuration_officecfg \
diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk
deleted file mode 100644
index 9542b790dc16..000000000000
--- a/officecfg/Package_cppheader.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: makefile; 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/.
-#
-
-$(eval $(call gb_Package_Package,officecfg_cppheader,$(WORKDIR)/CustomTarget/officecfg/registry))
-
-$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),$(call \
-    gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx)))
-
-# vim: set noet sw=4 ts=4: