diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 19:20:06 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:30 +0200 |
| commit | 30ad101b102e4d69c9d2c55884ab975145d8c1db (patch) | |
| tree | d6ca4218d2cf0f07c442c4f51d97367faffc2a69 /tomcat | |
| parent | stop using apache-commons jars from OUTDIR too (diff) | |
| download | core-30ad101b102e4d69c9d2c55884ab975145d8c1db.tar.gz core-30ad101b102e4d69c9d2c55884ab975145d8c1db.zip | |
tomcat: use servlet-api.jar from WORKDIR too
Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
Diffstat (limited to 'tomcat')
| -rw-r--r-- | tomcat/Module_tomcat.mk | 1 | ||||
| -rw-r--r-- | tomcat/Package_tomcat.mk | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/tomcat/Module_tomcat.mk b/tomcat/Module_tomcat.mk index 05865738ee93..621b8071d818 100644 --- a/tomcat/Module_tomcat.mk +++ b/tomcat/Module_tomcat.mk @@ -13,7 +13,6 @@ ifneq ($(ENABLE_JAVA),) ifneq ($(filter TOMCAT,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,tomcat,\ ExternalProject_tomcat \ - Package_tomcat \ UnpackedTarball_tomcat \ )) endif diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk deleted file mode 100644 index 1ab9c5c9db21..000000000000 --- a/tomcat/Package_tomcat.mk +++ /dev/null @@ -1,16 +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/. -# - -$(eval $(call gb_Package_Package,tomcat_inc,$(call gb_UnpackedTarball_get_dir,tomcat))) - -$(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat)) - -$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,servletapi/jsr154/dist/lib/servlet-api.jar)) - -# vim: set noet sw=4 ts=4: |