oox: remove Package_generated and Package_tokens

Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8

5 files changed, 1 insertions, 40 deletions

diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 2d7b67c424bb..aca38ab6b3a6 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,oox/generated))
 
 oox_SRC := $(SRCDIR)/oox/source/token
 oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc
-oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc
+oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)
 oox_GENHEADERPATH := $(oox_INC)/oox/token
 
 $(oox_MISC)/vmlexport-shape-types.cxx : \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a8c95ee980f1..3d8743fe4f40 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -9,11 +9,6 @@
 
 $(eval $(call gb_Library_Library,oox))
 
-$(eval $(call gb_Library_use_packages,oox,\
-    oox_generated \
-    oox_tokens \
-))
-
 $(eval $(call gb_Library_set_precompiled_header,oox,$(SRCDIR)/oox/inc/pch/precompiled_oox))
 
 $(eval $(call gb_Library_use_custom_headers,oox,oox/generated))
@@ -21,7 +16,6 @@ $(eval $(call gb_Library_use_custom_headers,oox,oox/generated))
 $(eval $(call gb_Library_set_include,oox,\
     $$(INCLUDE) \
     -I$(SRCDIR)/oox/inc \
-    -I$(call gb_CustomTarget_get_workdir,oox/generated)/inc \
 ))
 
 ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64)
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 3de3f1a81719..c086254b9218 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -12,8 +12,6 @@ $(eval $(call gb_Module_Module,oox))
 $(eval $(call gb_Module_add_targets,oox,\
 	CustomTarget_generated \
     Library_oox \
-    Package_generated \
-    Package_tokens \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
deleted file mode 100644
index 69e8c904d570..000000000000
--- a/oox/Package_generated.mk
+++ /dev/null
@@ -1,17 +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/.
-#
-
-$(eval $(call gb_Package_Package,oox_generated,$(call gb_CustomTarget_get_workdir,oox/generated)))
-
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,inc/oox/token/namespaces.hxx))
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/properties.hxx,inc/oox/token/properties.hxx))
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt))
-
-# vim: set noet sw=4 ts=4:
diff --git a/oox/Package_tokens.mk b/oox/Package_tokens.mk
deleted file mode 100644
index d79743b13de2..000000000000
--- a/oox/Package_tokens.mk
+++ /dev/null
@@ -1,14 +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/.
-#
-
-$(eval $(call gb_Package_Package,oox_tokens,$(SRCDIR)/oox/source/token))
-
-$(eval $(call gb_Package_add_file,oox_tokens,inc/oox/tokens.txt,tokens.txt))
-
-# vim: set noet sw=4 ts=4: