sysui/CustomTarget_deb.mk | 2 ++
sysui/CustomTarget_rpm.mk | 2 ++
sysui/CustomTarget_share.mk | 12 ++----------
sysui/CustomTarget_slackware.mk | 2 ++
sysui/CustomTarget_solaris.mk | 2 ++
sysui/Package_desktop.mk | 2 ++
sysui/productlist.mk | 20 ++++++++++++++++++++
7 files changed, 32 insertions(+), 10 deletions(-)
New commits:
commit 514d69eff398b32639fe4d91b503740da1aac3ae
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 18 09:11:24 2013 +0200
put common vars into standalone makefile
Change-Id: Iab78a95bc8588b89fb10dc96b6c2c25e864fc1f4
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 80f29e3..81afdd9 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+include $(SRCDIR)/sysui/productlist.mk
+
deb_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/deb)
deb_SRCDIR := $(SRCDIR)/sysui/desktop/debian
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index feccac8..8cc56ed 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+include $(SRCDIR)/sysui/productlist.mk
+
rpm_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/rpm)
rpm_SRCDIR := $(SRCDIR)/sysui/desktop
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index f3a5563..e342cfa 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+include $(SRCDIR)/sysui/productlist.mk
+
ifeq ($(ENABLE_GIO),TRUE)
brand_URIPARAM := --urls
else
@@ -112,16 +114,6 @@ ULFS := documents.ulf \
launcher_genericname.ulf \
launcher_unityquicklist.ulf
-PRODUCTLIST := libreoffice libreofficedev oxygenoffice
-PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
-PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
-PRODUCTNAME.libreoffice := LibreOffice
-PRODUCTNAME.libreofficeodev := LibreOfficeDev
-PRODUCTNAME.oxygenoffice := OxygenOffice
-UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT)
-UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT)
-UNIXFILENAME.oxygenoffice := oxygenoffice$(PKGVERSIONSHORT)
-
$(eval $(call gb_CustomTarget_CustomTarget,sysui/share))
$(eval $(call gb_CustomTarget_register_targets,sysui/share,\
diff --git a/sysui/CustomTarget_slackware.mk b/sysui/CustomTarget_slackware.mk
index e5145fe..f717df7 100644
--- a/sysui/CustomTarget_slackware.mk
+++ b/sysui/CustomTarget_slackware.mk
@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+include $(SRCDIR)/sysui/productlist.mk
+
slack_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/slackware)
slack_SRCDIR := $(SRCDIR)/sysui/desktop/slackware
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
index 8d9210c..9f671a8 100644
--- a/sysui/CustomTarget_solaris.mk
+++ b/sysui/CustomTarget_solaris.mk
@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+include $(SRCDIR)/sysui/productlist.mk
+
solaris_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/solaris)
solaris_SRCDIR := $(SRCDIR)/sysui/desktop/solaris
diff --git a/sysui/Package_desktop.mk b/sysui/Package_desktop.mk
index 80e71ba..64984a7 100644
--- a/sysui/Package_desktop.mk
+++ b/sysui/Package_desktop.mk
@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+include $(SRCDIR)/sysui/productlist.mk
+
$(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget))
ifneq ($(filter deb,$(PKGFORMAT)),)
diff --git a/sysui/productlist.mk b/sysui/productlist.mk
new file mode 100644
index 0000000..00d471e
--- /dev/null
+++ b/sysui/productlist.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+PRODUCTLIST := libreoffice libreofficedev oxygenoffice
+PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
+PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
+PRODUCTNAME.libreoffice := LibreOffice
+PRODUCTNAME.libreofficeodev := LibreOfficeDev
+PRODUCTNAME.oxygenoffice := OxygenOffice
+UNIXFILENAME.libreoffice := $(PRODUCTNAMELC.libreoffice)$(PKGVERSIONSHORT)
+UNIXFILENAME.libreofficedev :=
$(PRODUCTNAMELC.libreofficedev)$(PKGVERSIONSHORT)
+UNIXFILENAME.oxygenoffice := $(PRODUCTNAMELC.oxygenoffice)$(PKGVERSIONSHORT)
+
+# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
