vcl: use CustomTarget makefile for kde_moc

4 files changed, 12 insertions, 45 deletions

diff --git a/vcl/unx/kde/fpicker/Makefile b/vcl/CustomTarget_kde_moc.mk
index b7ba64946ba8..7d54c0b0d307 100644
--- a/vcl/unx/kde/fpicker/Makefile
+++ b/vcl/CustomTarget_kde_moc.mk
@@ -25,11 +25,16 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-kdefilepicker.moc.cxx : $(SRCDIR)/fpicker/source/unx/kde/kdefilepicker.hxx
-	$(MOC) -o $@ $<
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style))
+
+VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
 
-.DEFAULT_GOAL := all
-.PHONY : all
-all : kdefilepicker.moc.cxx
+$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
+	$(VCKF)/kdefilepicker.moc.cxx
+
+$(VCKF)/kdefilepicker.moc.cxx : \
+		$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx | $(VCKF)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
+	$(MOC) -o $@ $<
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
index 7820efc0fd37..2bfa978d6b3e 100644
--- a/vcl/Executable_kdefilepicker.mk
+++ b/vcl/Executable_kdefilepicker.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,kdefilepicker))
 
-$(eval $(call gb_Executable_add_package_headers,kdefilepicker,\
-	vcl_kde_moc \
-))
-
 $(eval $(call gb_Executable_add_defs,kdefilepicker,\
 	$(KDE_CFLAGS) \
 ))
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index dcde2a62366e..2cd2bf5d667b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -57,6 +57,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
 endif
 ifneq ($(ENABLE_KDE),)
 $(eval $(call gb_Module_add_targets,vcl,\
+    CustomTarget_kde_moc \
+    Executable_kdefilepicker \
     Library_vclplug_kde \
 ))
 endif
diff --git a/vcl/Package_kde_moc.mk b/vcl/Package_kde_moc.mk
deleted file mode 100644
index 3e6b7ec47651..000000000000
--- a/vcl/Package_kde_moc.mk
+++ /dev/null
@@ -1,36 +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) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.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_Package_Package,vcl_kde_moc,$(WORKDIR)/CustomTarget/vcl/unx/kde/fpicker))
-
-$(eval $(call gb_Package_add_customtarget,vcl_kde_moc,vcl/unx/kde/fpicker))
-
-$(eval $(call gb_CustomTarget_add_dependencies,vcl/unx/kde/fpicker,\
-    vcl/unx/kde/fpicker/kdefilepicker.hxx \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: