[Libreoffice-commits] .: 3 commits - fpicker/Executable_kdefilepicker.mk fpicker/Library_fps_kde4.mk fpicker/Module_fpicker.mk fpicker/Package_kde4_moc.mk fpicker/Package_kde_moc.mk fpicker/source
David Tardon
dtardon at kemper.freedesktop.org
Sat Jan 7 06:43:26 PST 2012
fpicker/Executable_kdefilepicker.mk | 8 ++---
fpicker/Library_fps_kde4.mk | 8 ++---
fpicker/Module_fpicker.mk | 52 ++++++++++++++++++++++--------------
fpicker/Package_kde4_moc.mk | 36 ++++++++++++++++++++++++
fpicker/Package_kde_moc.mk | 36 ++++++++++++++++++++++++
fpicker/source/unx/kde/Makefile | 35 ++++++++++++++++++++++++
fpicker/source/unx/kde4/Makefile | 35 ++++++++++++++++++++++++
7 files changed, 183 insertions(+), 27 deletions(-)
New commits:
commit e99464ea0f8aec2d015b3136b84a3b26e2bcda52
Author: David Tardon <dtardon at redhat.com>
Date: Sat Jan 7 15:22:39 2012 +0100
use custom target for generated source
diff --git a/fpicker/Executable_kdefilepicker.mk b/fpicker/Executable_kdefilepicker.mk
index 1352efd..036e59a 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 2682802..1f0696f 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 0000000..1350937
--- /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 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,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 0000000..445c446
--- /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 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 :
+ $(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:
commit 5bbdab11f6485ec64d93036f0bbfc5eda5842a9d
Author: David Tardon <dtardon at redhat.com>
Date: Sat Jan 7 15:19:56 2012 +0100
split module targets' registration
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 7bb3a34..2682802 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -33,28 +33,40 @@ $(eval $(call gb_Module_add_targets,fpicker,\
AllLangResTarget_fps_office \
Library_fpicker \
Library_fps_office \
- $(if $(filter $(GUIBASE),aqua), \
- Library_fps_aqua \
- ) \
- $(if $(filter $(OS),WNT), \
- Library_fps_odma \
- Library_fop \
- Library_fps \
- Package_xml \
- WinResTarget_fps \
- ) \
- $(if $(filter $(GUIBASE),unx), \
- $(if $(filter $(ENABLE_KDE),TRUE), \
- Executable_kdefilepicker \
- Library_fps_kde \
- ) \
- $(if $(filter $(ENABLE_KDE4),TRUE), \
- Library_fps_kde4 \
- Package_kde4_moc \
- ) \
- ) \
))
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_aqua \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_odma \
+ Library_fop \
+ Library_fps \
+ Package_xml \
+ WinResTarget_fps \
+))
+endif
+
+ifeq ($(GUIBASE),unx)
+ifeq ($(ENABLE_KDE),TRUE)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Executable_kdefilepicker \
+ Library_fps_kde \
+))
+endif
+
+ifeq ($(ENABLE_KDE4),TRUE)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_kde4 \
+ Package_kde4_moc \
+))
+endif
+endif
+
endif
# vim: set noet sw=4 ts=4:
commit 4492deb4d5a57a5e7a20fd92203236aefc7dac99
Author: David Tardon <dtardon at redhat.com>
Date: Sat Jan 7 15:08:09 2012 +0100
use custom target for generated source
diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
index db41506..10a06c7 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 133eebf..7bb3a34 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 0000000..27ab13a
--- /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 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,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 0000000..cd0ad6e
--- /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 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.
+
+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:
More information about the Libreoffice-commits
mailing list