diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 19:52:45 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 20:17:26 +0100 |
commit | bf0e30f9cdee963d3cf889305c85b53c21b8c974 (patch) | |
tree | 7ae1f75372bcc74dc725c7886efe13f03d718530 /jvmfwk | |
parent | 124f5e71d3d573c0459b41ce0b93cd22f6ed4c2c (diff) |
jvmfwk: remove Package_*solver
Change-Id: I5784f3c060680c366053334db8a879250bfdbbbe
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/Module_jvmfwk.mk | 2 | ||||
-rw-r--r-- | jvmfwk/Package_jreproperties_solver.mk | 22 | ||||
-rw-r--r-- | jvmfwk/Package_rcfiles_solver.mk | 37 |
3 files changed, 0 insertions, 61 deletions
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index e5caeba58307..00fd9c569008 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -16,9 +16,7 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\ Library_jvmfwk \ Library_sunjavaplugin \ Package_jreproperties \ - Package_jreproperties_solver \ Package_rcfiles \ - Package_rcfiles_solver \ )) ifneq (,$(filter-out MACOSX WNT,$(OS))) diff --git a/jvmfwk/Package_jreproperties_solver.mk b/jvmfwk/Package_jreproperties_solver.mk deleted file mode 100644 index 1a9b49b33a90..000000000000 --- a/jvmfwk/Package_jreproperties_solver.mk +++ /dev/null @@ -1,22 +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/. -# - -ifeq ($(OS),WNT) -jvmfwk_Package_jreproperties_solver_LIBDIR := bin -else -jvmfwk_Package_jreproperties_solver_LIBDIR := lib -endif - -$(eval $(call gb_Package_Package,jvmfwk_jreproperties_solver,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties))) - -$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_solver,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_solver,$(jvmfwk_Package_jreproperties_solver_LIBDIR)/JREProperties.class,JREProperties.class)) - -# vim:set noet sw=4 ts=4: diff --git a/jvmfwk/Package_rcfiles_solver.mk b/jvmfwk/Package_rcfiles_solver.mk deleted file mode 100644 index 6fc4a091c298..000000000000 --- a/jvmfwk/Package_rcfiles_solver.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/. -# - -ifeq ($(OS),WNT) -jvmfwk_Package_rcfiles_solver_LIBDIR := bin -else -jvmfwk_Package_rcfiles_solver_LIBDIR := lib -endif - -$(eval $(call gb_Package_Package,jvmfwk_rcfiles_solver,$(SRCDIR)/jvmfwk)) - -$(eval $(call gb_Package_set_outdir,jvmfwk_rcfiles_solver,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,jvmfwk3),source/jvmfwk3rc)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) - -ifeq ($(OS),AIX) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) -else ifeq ($(OS),FREEBSD) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) -else ifeq ($(OS),LINUX) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) -else ifeq ($(OS),MACOSX) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) -else ifeq ($(OS),WNT) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) -else -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) -endif - -# vim:set noet sw=4 ts=4: |