[Libreoffice-commits] .: vcl/Library_vclplug_kde4.mk vcl/Module_vcl.mk vcl/Package_kde4moc.mk vcl/unx

[Caolán McNamara]

 vcl/Library_vclplug_kde4.mk  |    4 ++++
 vcl/Module_vcl.mk            |    1 +
 vcl/Package_kde4moc.mk       |   29 +++++++++++++++++++++++++++++
 vcl/unx/kde4/KDEXLib.moc.cxx |   29 +++++++++++++++++++++++++++++
 vcl/unx/kde4/Makefile        |   32 ++++++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+)

New commits:
commit 2df3794c3d4b7e6b622b3aa7bcda9dfed5d6f965
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 29 22:26:41 2011 +0100

    add custom rule to build moc stuff for kde4

diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index e7160ee..69e7a73 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,vclplug_kde4))
 
+$(eval $(call gb_Library_add_package_headers,vcl,vcl_kde4moc))
+
 $(eval $(call gb_Library_set_include,vclplug_kde4,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
@@ -34,6 +36,7 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
     -I$(SRCDIR)/solenv/inc \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \
 ))
 
 $(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
@@ -82,6 +85,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
     vcl/unx/kde4/KDESalGraphics \
     vcl/unx/kde4/KDESalInstance \
     vcl/unx/kde4/KDEXLib \
+    vcl/unx/kde4/KDEXLib.moc \
     vcl/unx/kde4/main \
     vcl/unx/kde4/VCLKDEApplication \
 ))
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 895e479..446bf36 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -56,6 +56,7 @@ endif
 ifneq ($(ENABLE_KDE4),)
 $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_kde4 \
+    Package_kde4moc \
 ))
 endif
 endif
diff --git a/vcl/Package_kde4moc.mk b/vcl/Package_kde4moc.mk
new file mode 100644
index 0000000..56d2f06
--- /dev/null
+++ b/vcl/Package_kde4moc.mk
@@ -0,0 +1,29 @@
+# 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. 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.
+#
+# The Initial Developer of the Original Code is
+#        Caolan McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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_kde4moc,$(WORKDIR)/CustomTarget/vcl/unx/kde4))
+$(eval $(call gb_Package_add_customtarget,vcl_kde4moc,vcl/unx/kde4))
+
+# vim: set noet sw=4:
diff --git a/vcl/unx/kde4/KDEXLib.moc.cxx b/vcl/unx/kde4/KDEXLib.moc.cxx
new file mode 100644
index 0000000..233068d
--- /dev/null
+++ b/vcl/unx/kde4/KDEXLib.moc.cxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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. 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.
+ *
+ * The Initial Developer of the Original Code is
+ *        Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm at redhat.com>
+ *
+ * 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.
+ */
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "KDEXLib.moc.hxx"
diff --git a/vcl/unx/kde4/Makefile b/vcl/unx/kde4/Makefile
new file mode 100644
index 0000000..115b842
--- /dev/null
+++ b/vcl/unx/kde4/Makefile
@@ -0,0 +1,32 @@
+# 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. 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.
+#
+# The Initial Developer of the Original Code is
+#        Caolan McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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.
+
+all : KDEXLib.moc.hxx
+
+KDEXLib.moc.hxx : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/KDEXLib.hxx
+	$(MOC4) $< -o $@
+
+.PHONY : all
+# vim: set noet sw=4: