filter: use CustomTarget makefile

4 files changed, 10 insertions, 55 deletions

diff --git a/filter/source/svg/Makefile b/filter/CustomTarget_svg.mk
index 31a42444b286..29156a778bbb 100644
--- a/filter/source/svg/Makefile
+++ b/filter/CustomTarget_svg.mk
@@ -25,11 +25,12 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-WORKDIR_FILTER := .
+$(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg,new_style))
 
-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild.mk
+FISS := $(call gb_CustomTarget_get_workdir,filter/source/svg)
+
+SRCDIR_FILTER := $(SRCDIR)/filter/source/svg
+WORKDIR_FILTER := $(FISS)
 
 filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
 filter_SRC_svg_GenToken := $(SRCDIR_FILTER)/gentoken.pl
@@ -42,7 +43,7 @@ filter_GEN_svg_Tokens_cxx := $(WORKDIR_FILTER)/tokens.cxx
 filter_GEN_svg_Script_hxx := $(WORKDIR_FILTER)/svgscript.hxx
 
 $(filter_GEN_svg_Tokens_gperf) : \
-			$(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens)
+			$(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) | $(FISS)/.dir
 	$(call gb_Output_announce,$@,build,GPF,3)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) \
@@ -59,16 +60,14 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
 			 > $(filter_GEN_svg_Tokens_cxx))
 
 $(filter_GEN_svg_Script_hxx) : \
-			$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx)
+			$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) | $(FISS)/.dir
 	$(call gb_Output_announce,$@,build,PY ,1)
 	$(call gb_Helper_abbreviate_dirs_native, \
 		$(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \
 			$(filter_SRC_svg_PresentationEngine) \
 			$(filter_GEN_svg_Script_hxx))
 
-.DEFAULT_GOAL:=all
-.PHONY: all
-all : \
+$(call gb_CustomTarget_get_target,filter/source/svg) : \
 	$(filter_GEN_svg_Tokens_gperf) \
 	$(filter_GEN_svg_Tokens_hxx) \
 	$(filter_GEN_svg_Tokens_cxx) \
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 8b0e0569d16d..567c29606aa0 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,svgfilter))
 
-$(eval $(call gb_Library_add_package_headers,svgfilter,filter_generated))
+$(eval $(call gb_Library_add_custom_headers,svgfilter,filter/source/svg))
 
 $(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter))
 
@@ -32,11 +32,6 @@ $(eval $(call gb_Library_add_api,svgfilter,\
 	offapi \
 ))
 
-$(eval $(call gb_Library_set_include,svgfilter,\
-	$$(INCLUDE) \
-	-I$(WORKDIR)/CustomTarget/filter/source/svg \
-))
-
 $(eval $(call gb_Library_add_linked_libs,svgfilter,\
 	svxcore \
 	editeng \
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 24fe97cdbcae..9bcfe3b76d0b 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,filter,\
 	AllLangResTarget_t602filter \
 	AllLangResTarget_xsltdlg \
 	Configuration_filter \
+	CustomTarget_svg \
 	Library_PptImporter \
 	Library_egi \
 	Library_eme \
@@ -64,7 +65,6 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Library_xsltfilter \
 	Package_inc \
 	Package_docbook \
-	Package_filter_generated \
 	Package_xslt \
 ))
 
diff --git a/filter/Package_filter_generated.mk b/filter/Package_filter_generated.mk
deleted file mode 100644
index d93416bbf4f8..000000000000
--- a/filter/Package_filter_generated.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; 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 Michael Stahl <mst@openoffice.org> (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_Package_Package,filter_generated,$(WORKDIR)/CustomTarget/filter/source/svg))
-
-$(eval $(call gb_Package_add_customtarget,filter_generated,filter/source/svg))
-
-$(eval $(call gb_CustomTarget_add_dependencies,filter/source/svg,\
-	filter/source/svg/gentoken.pl \
-	filter/source/svg/tokens.txt \
-	filter/source/svg/presentation_engine.js \
-	filter/source/svg/js2hxx.py \
-))
-
-# vim: set noet sw=4 ts=4: