diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-23 16:11:57 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-23 16:43:03 +0100 |
| commit | 636a8f2943ce5d11acc05ebed0c5f50edaef6b03 (patch) | |
| tree | 8167a5f43f50c99ea449305e96d44be6d2b50785 /accessibility | |
| parent | 7fe7126248ff043e2f9a36f07c544602f1d774af (diff) | |
use generated java source
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/Jar_accessibility.mk | 11 | ||||
| -rw-r--r-- | accessibility/bridge/Makefile | 15 |
2 files changed, 7 insertions, 19 deletions
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk index ffb86ee74911..2eb0f726f579 100644 --- a/accessibility/Jar_accessibility.mk +++ b/accessibility/Jar_accessibility.mk @@ -31,15 +31,10 @@ $(eval $(call gb_Jar_add_jars,java_accessibility,\ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ - $(WORKDIR)/CustomTarget/accessibility/bridge/classes \ )) $(eval $(call gb_Jar_set_packageroot,java_accessibility,org)) -$(eval $(call gb_Jar_add_packagedirs,java_accessibility,\ - $(WORKDIR)/CustomTarget/accessibility/bridge/classes/org \ -)) - $(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\ accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \ accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \ @@ -88,9 +83,13 @@ $(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\ accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog \ )) +$(eval $(call gb_Jar_add_generated_sourcefiles,java_accessibility,\ + CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \ +)) + # Dummy dep. to satisfy make's depsolver: .../classes is created by a # custom target, so there is no dependency information for it here. # It also makes sure that the package is built before this jar .-) -$(WORKDIR)/CustomTarget/accessibility/bridge/classes :| $(call gb_Package_get_target,accessibility_bridge) +$(call gb_Jar_get_target,java_accessibility) :| $(call gb_Package_get_target,accessibility_bridge) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/accessibility/bridge/Makefile b/accessibility/bridge/Makefile index 67792cd542ba..9ed435aa7135 100644 --- a/accessibility/bridge/Makefile +++ b/accessibility/bridge/Makefile @@ -26,10 +26,6 @@ # instead of those above. gb_PARTIALBUILD := T -include $(GBUILDDIR)/gbuild.mk - -TARGETDIR := $(WORKDIR)/CustomTarget/accessibility/bridge -PACKAGE := org/openoffice/java/accessibility ifeq ($(PRODUCT),) DEBUGSWITCH := true @@ -39,14 +35,7 @@ DEBUGSWITCH := false PRODUCTSWITCH := true endif -$(TARGETDIR)/done : $(TARGETDIR)/classes/$(PACKAGE)/Build.class - mkdir -p $(dir $@) && touch $@ - -$(TARGETDIR)/classes/$(PACKAGE)/Build.class : $(TARGETDIR)/src/$(PACKAGE)/Build.java | $(gb_JavaClassSet_JAVACCOMMAND) - mkdir -p $(dir $@) && \ - $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(TARGETDIR)/classes $^ - -$(TARGETDIR)/src/$(PACKAGE)/Build.java : +org/openoffice/java/accessibility/Build.java : mkdir -p $(dir $@) && (\ echo package org.openoffice.java.accessibility\; && \ echo public class Build \{ && \ @@ -58,6 +47,6 @@ $(TARGETDIR)/src/$(PACKAGE)/Build.java : .DEFAULT_GOAL := all .PHONY : all all : \ - $(TARGETDIR)/done + org/openoffice/java/accessibility/Build.java # vim: set ts=4 sw=4 et: |