5ba1694606
...by folding the contents of java_accessibility.jar back into java_uno_accessbridge.jar. In the old build system there were two jars, java_uno_accessbridge.jar containing the handful of org.openoffice.accessibility classes and all org.openoffice.java.accessibility classes (though how the latter got included was fairly obscure in the makefile.mk) and unused java_accessibility.jar that contained all org.openoffice.java.accessibility classes. When adapting this to gbuild, the unused java_accessibility.jar was carried over, but all its org.openoffice.accessibility classes were inadvertently droped from java_uno_accessbridge.jar. Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac
46 lines
1.5 KiB
Makefile
46 lines
1.5 KiB
Makefile
# -*- 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@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_Module_Module,accessibility))
|
|
|
|
$(eval $(call gb_Module_add_targets,accessibility,\
|
|
AllLangResTarget_acc \
|
|
Library_acc \
|
|
))
|
|
|
|
ifneq ($(SOLAR_JAVA),)
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Module_add_targets,accessibility,\
|
|
CustomTarget_bridge \
|
|
CustomTarget_bridge_inc \
|
|
Jar_uno_accessbridge \
|
|
Library_java_uno_accessbridge \
|
|
))
|
|
endif
|
|
endif
|
|
|
|
# vim:set shiftwidth=4 softtabstop=4 expandtab:
|