strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ridljar: use CustomTarget makefile

Browse source
This commit is contained in:
Matúš Kukan 2012-04-05 16:40:01 +02:00
parent c92c4ca8ed
commit 1dc52cbc24
4 changed files with 12 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ridljar/javamaker/Makefile → ridljar/CustomTarget_javamaker.mk
View file

@ -25,15 +25,16 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
gb_PARTIALBUILD := T
include $(GBUILDDIR)/gbuild_simple.mk
$(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker,new_style))
done : $(OUTDIR)/bin/udkapi.rdb
RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(RJJM)/done
$(RJJM)/done : $(OUTDIR)/bin/udkapi.rdb \
$(call gb_Executable_get_target_for_build,javamaker) | $(RJJM)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@)
.DEFAULT_GOAL := all
.PHONY : all
all : done
$(call gb_Helper_execute,javamaker -BUCR -O$(RJJM)/class $<) && touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:

4
ridljar/Jar_ridl.mk
View file

@ -27,8 +27,8 @@
$(eval $(call gb_Jar_Jar,ridl))
$(eval $(call gb_Jar_add_package_dependencies,ridl,\
ridljar_javamaker \
$(eval $(call gb_Jar_add_customtarget_dependencies,ridl,\
ridljar/javamaker \
))
$(eval $(call gb_Jar_add_jars,ridl,\

2
ridljar/Module_ridljar.mk
View file

@ -29,9 +29,9 @@ $(eval $(call gb_Module_Module,ridljar))
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,ridljar,\
CustomTarget_javamaker \
Jar_ridl \
Jar_unoloader \
Package_javamaker \
Zip_ridl \
Zip_unoloader \
))

37
ridljar/Package_javamaker.mk
View file

@ -1,37 +0,0 @@
# -*- 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_Package_Package,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridljar/javamaker))
$(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker))
$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\
$(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
$(OUTDIR)/bin/udkapi.rdb \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab: