diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 14:05:22 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:21 +0100 |
| commit | 9c40b2d67cf87018e45a89f71e40ba090769d392 (patch) | |
| tree | 2646d9694e58c5efbf5d8862a028447fc78667d9 /sysui | |
| parent | 9aa6fbb518c0b690741af1e07bae894e5cd4ebba (diff) | |
sysui: remove Package_desktop
... put the CustomTarget dir on the search path instead.
Change-Id: I2888e10bfa58d3c5b0f39958328efb14c3ce92a9
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/Module_sysui.mk | 1 | ||||
| -rw-r--r-- | sysui/Package_desktop.mk | 37 |
2 files changed, 0 insertions, 38 deletions
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk index 99ea359348e2..3f1ad7c655e8 100644 --- a/sysui/Module_sysui.mk +++ b/sysui/Module_sysui.mk @@ -14,7 +14,6 @@ ifneq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,sysui,\ CustomTarget_share \ Package_share \ - Package_desktop \ $(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ diff --git a/sysui/Package_desktop.mk b/sysui/Package_desktop.mk deleted file mode 100644 index 0f0df9b03efb..000000000000 --- a/sysui/Package_desktop.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -*- 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/. -# - -include $(SRCDIR)/sysui/productlist.mk - -$(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget)) - -$(eval $(call gb_Package_set_outdir,desktop,$(OUTDIR))) - -ifneq ($(filter deb,$(PKGFORMAT)),) -$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/deb,\ - $(foreach product,$(PRODUCTLIST),\ - sysui/deb/$(product)-desktop-integration.tar.gz) \ -)) -endif - -ifneq ($(filter rpm,$(PKGFORMAT)),) -$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/rpm,\ - $(foreach product,$(PRODUCTLIST),\ - sysui/rpm/$(product)-desktop-integration.tar.gz) \ -)) -endif - -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/pkg,\ - $(foreach product,$(PRODUCTLIST),\ - sysui/solaris/$(product)-desktop-integration.tar.gz) \ -)) -endif - -# vim: set noet sw=4 ts=4: |