diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-30 20:17:20 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-04 11:31:56 +0200 |
| commit | d26e13bd7a8693867ab86eabec50212c95d4f3f6 (patch) | |
| tree | ba77cae42423d5b4c19949187db06c76b41f3fa2 /jvmfwk | |
| parent | 58404101e8cd436131fe0e8a36b467f167d7b8df (diff) | |
jvmfwk: use CustomTarget makefile
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/CustomTarget_jreproperties.mk (renamed from jvmfwk/plugins/sunmajor/pluginlib/Makefile) | 16 | ||||
| -rw-r--r-- | jvmfwk/Module_jvmfwk.mk | 1 | ||||
| -rw-r--r-- | jvmfwk/Package_jreproperties.mk | 8 |
3 files changed, 11 insertions, 14 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/CustomTarget_jreproperties.mk index b190038ef79c..6b49d64396ac 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/Makefile +++ b/jvmfwk/CustomTarget_jreproperties.mk @@ -25,14 +25,16 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(GBUILDDIR)/gbuild.mk +$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties,new_style)) -JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java - $(call gb_Helper_abbreviate_dirs_native, \ - $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) +JFJP := $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties) + +$(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(JFJP)/JREProperties.class -.DEFAULT_GOAL := all -.PHONY : all -all : JREProperties.class +$(JFJP)/JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \ + | $(JFJP)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1) + $(call gb_Helper_abbreviate_dirs_native, \ + cd $(dir $@) && $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 381af369e716..6757b903a57b 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\ ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,jvmfwk,\ + CustomTarget_jreproperties \ Library_sunjavaplugin \ Package_jreproperties \ )) diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk index 4e35e7ea6c92..f8449b7032e5 100644 --- a/jvmfwk/Package_jreproperties.mk +++ b/jvmfwk/Package_jreproperties.mk @@ -25,13 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(WORKDIR)/CustomTarget/jvmfwk/plugins/sunmajor/pluginlib)) - -$(eval $(call gb_Package_add_customtarget,jvmfwk_jreproperties,jvmfwk/plugins/sunmajor/pluginlib)) - -$(eval $(call gb_CustomTarget_add_dependencies,jvmfwk/plugins/sunmajor/pluginlib,\ - jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \ -)) +$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties))) $(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class)) $(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class)) |