[Libreoffice-commits] .: 2 commits - postprocess/packcomponents Repository.mk scp2/source vcl/CustomTarget_kde_moc.mk vcl/Executable_kdefilepicker.mk vcl/Module_vcl.mk vcl/Package_kde_moc.mk vcl/unx
Matus Kukan
mkukan at kemper.freedesktop.org
Mon Apr 2 17:11:21 PDT 2012
Repository.mk | 6 ----
postprocess/packcomponents/makefile.mk | 4 ---
scp2/source/ooo/file_library_ooo.scp | 16 -------------
vcl/CustomTarget_kde_moc.mk | 40 +++++++++++++++++++++++++++++++++
vcl/Executable_kdefilepicker.mk | 4 ---
vcl/Module_vcl.mk | 2 +
vcl/Package_kde_moc.mk | 36 -----------------------------
vcl/unx/kde/fpicker/Makefile | 35 ----------------------------
8 files changed, 42 insertions(+), 101 deletions(-)
New commits:
commit 19b7edb9c65793821bee984d2da43fbfbd605e74
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 3 02:06:48 2012 +0200
fps_kde and fps_kde4 are no more
diff --git a/Repository.mk b/Repository.mk
index 74452fd..a112669 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -489,12 +489,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
$(if $(filter $(OS),WNT), \
fps_odma \
) \
- $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
- fps_kde \
- ) \
- $(if $(filter $(GUIBASE)$(ENABLE_KDE4),unxTRUE), \
- fps_kde4 \
- ) \
))
ifeq ($(OS),WNT)
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 47a7d7c..488e322 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -375,10 +375,6 @@ my_components += mozbootstrap
.END
.ENDIF
-.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
-my_components += component/fpicker/source/unx/kde4/fps_kde4
-.END
-
.IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless"
my_components += cmdmail
.END
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1b464cf..689a71b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -502,24 +502,8 @@ File gid_File_Lib_Desktopbe
Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
End
-#ifdef ENABLE_KDE4
-#ifndef MACOSX
-File gid_File_Lib_Fps_Kde4
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
-End
-#endif
-#endif
#ifdef ENABLE_KDE
#ifndef MACOSX
-File gid_File_Lib_Fps_Kde
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
-End
File gid_File_Bin_KdeFilePicker
BIN_FILE_BODY;
Styles = (PACKED);
commit 8464e311309ca918ac3a7d111c0f6927bfe825f8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 3 01:40:29 2012 +0200
vcl: use CustomTarget makefile for kde_moc
diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
new file mode 100644
index 0000000..7d54c0b
--- /dev/null
+++ b/vcl/CustomTarget_kde_moc.mk
@@ -0,0 +1,40 @@
+# -*- 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 at 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_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style))
+
+VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
+
+$(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 7820efc..2bfa978 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 dcde2a6..2cd2bf5 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 3e6b7ec..0000000
--- 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 at 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:
diff --git a/vcl/unx/kde/fpicker/Makefile b/vcl/unx/kde/fpicker/Makefile
deleted file mode 100644
index b7ba649..0000000
--- a/vcl/unx/kde/fpicker/Makefile
+++ /dev/null
@@ -1,35 +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 at 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 : $(SRCDIR)/fpicker/source/unx/kde/kdefilepicker.hxx
- $(MOC) -o $@ $<
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : kdefilepicker.moc.cxx
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
More information about the Libreoffice-commits
mailing list