use custom target for generated source

4 files changed, 76 insertions, 4 deletions

diff --git a/fpicker/Executable_kdefilepicker.mk b/fpicker/Executable_kdefilepicker.mk
index 1352efdb29cf..036e59a2490d 100644
--- a/fpicker/Executable_kdefilepicker.mk
+++ b/fpicker/Executable_kdefilepicker.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Executable_Executable,kdefilepicker))
 
+$(eval $(call gb_Executable_add_package_headers,kdefilepicker,\
+	fpicker_kde_moc \
+))
+
 $(eval $(call gb_Executable_add_defs,kdefilepicker,\
 	$(KDE_CFLAGS) \
 ))
@@ -52,8 +56,4 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
 	CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc \
 ))
 
-$(WORKDIR)/CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc.cxx : $(SRCDIR)/fpicker/source/unx/kde/kdefilepicker.hxx
-	mkdir -p $(dir $@)
-	$(MOC) $< -o $@
-
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 268280214466..1f0696fde1b2 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -56,6 +56,7 @@ ifeq ($(ENABLE_KDE),TRUE)
 $(eval $(call gb_Module_add_targets,fpicker,\
 	Executable_kdefilepicker \
 	Library_fps_kde \
+	Package_kde_moc \
 ))
 endif
 
diff --git a/fpicker/Package_kde_moc.mk b/fpicker/Package_kde_moc.mk
new file mode 100644
index 000000000000..1350937959b2
--- /dev/null
+++ b/fpicker/Package_kde_moc.mk
@@ -0,0 +1,36 @@
+# -*- 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,fpicker_kde_moc,$(WORKDIR)/CustomTarget/fpicker/source/unx/kde))
+
+$(eval $(call gb_Package_add_customtarget,fpicker_kde_moc,fpicker/source/unx/kde))
+
+$(eval $(call gb_CustomTarget_add_dependencies,fpicker/source/unx/kde,\
+    fpicker/source/unx/kde/kdefilepicker.hxx \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/fpicker/source/unx/kde/Makefile b/fpicker/source/unx/kde/Makefile
new file mode 100644
index 000000000000..445c4467b2d4
--- /dev/null
+++ b/fpicker/source/unx/kde/Makefile
@@ -0,0 +1,35 @@
+# -*- 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.
+
+kdefilepicker.moc.cxx :
+	$(MOC) -o $@ $(SRCDIR)/fpicker/source/unx/kde/kdefilepicker.hxx
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : kdefilepicker.moc.cxx
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab: