use custom target for generated source

4 files changed, 76 insertions, 4 deletions

diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
index db41506d27a5..10a06c74a6d6 100644
--- a/fpicker/Library_fps_kde4.mk
+++ b/fpicker/Library_fps_kde4.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,fps_kde4))
 
+$(eval $(call gb_Library_add_package_headers,fps_kde4,\
+	fpicker_kde4_moc \
+))
+
 $(eval $(call gb_Library_set_componentfile,fps_kde4,fpicker/source/unx/kde4/fps_kde4))
 
 $(eval $(call gb_Library_add_api,fps_kde4,\
@@ -61,8 +65,4 @@ $(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\
 	CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \
 ))
 
-$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc.cxx: $(SRCDIR)/fpicker/source/unx/kde4/KDE4FilePicker.hxx
-	mkdir -p $(dir $@)
-	$(MOC4) $< -o $@
-	
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 133eebfd2b6b..7bb3a3420130 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_targets,fpicker,\
 		) \
 		$(if $(filter $(ENABLE_KDE4),TRUE), \
 			Library_fps_kde4 \
+			Package_kde4_moc \
 		) \
 	) \
 ))
diff --git a/fpicker/Package_kde4_moc.mk b/fpicker/Package_kde4_moc.mk
new file mode 100644
index 000000000000..27ab13a46ae5
--- /dev/null
+++ b/fpicker/Package_kde4_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_kde4_moc,$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4))
+
+$(eval $(call gb_Package_add_customtarget,fpicker_kde4_moc,fpicker/source/unx/kde4))
+
+$(eval $(call gb_CustomTarget_add_dependencies,fpicker/source/unx/kde4,\
+    fpicker/source/unx/kde4/KDE4FilePicker.hxx \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/fpicker/source/unx/kde4/Makefile b/fpicker/source/unx/kde4/Makefile
new file mode 100644
index 000000000000..cd0ad6e62826
--- /dev/null
+++ b/fpicker/source/unx/kde4/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.
+
+KDE4FilePicker.moc.cxx :
+	$(MOC4) -o $@ $(SRCDIR)/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : KDE4FilePicker.moc.cxx
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab: