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

[Lubos Lunak]

 vcl/Library_vclplug_kde4.mk  |    1 -
 vcl/unx/kde4/KDEXLib.cxx     |    2 ++
 vcl/unx/kde4/KDEXLib.moc.cxx |   29 -----------------------------
 vcl/unx/kde4/Makefile        |    4 ++--
 4 files changed, 4 insertions(+), 32 deletions(-)

New commits:
commit 65e42065ddf448b17abd861df590b1992e2e94c9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue May 31 14:21:30 2011 +0200

    do not have a .cxx file just for #including a .moc file

diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 69e7a73..0f7f3e7 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -85,7 +85,6 @@ $(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/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 3bd7d54..73021f4 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -419,4 +419,6 @@ void KDEXLib::doStartup()
     }
 }
 
+#include "KDEXLib.moc"
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde4/KDEXLib.moc.cxx b/vcl/unx/kde4/KDEXLib.moc.cxx
deleted file mode 100644
index 233068d..0000000
--- a/vcl/unx/kde4/KDEXLib.moc.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- 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
index 115b842..4259715 100644
--- a/vcl/unx/kde4/Makefile
+++ b/vcl/unx/kde4/Makefile
@@ -23,9 +23,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-all : KDEXLib.moc.hxx
+KDEXLib.cxx : KDEXLib.moc
 
-KDEXLib.moc.hxx : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/KDEXLib.hxx
+KDEXLib.moc : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/KDEXLib.hxx
 	$(MOC4) $< -o $@
 
 .PHONY : all