equal
deleted
inserted
replaced
30 include RMICompilation.gmk |
30 include RMICompilation.gmk |
31 |
31 |
32 # To ensure the latest stub generator files are picked up from corba repo |
32 # To ensure the latest stub generator files are picked up from corba repo |
33 # when available, we need to run with latest rmic version available. |
33 # when available, we need to run with latest rmic version available. |
34 ifneq ($(COMPILE_TYPE),cross) |
34 ifneq ($(COMPILE_TYPE),cross) |
35 RMIC := $(UNCYGDRIVE) $(JDK_OUTPUTDIR)/bin/rmic |
35 RMIC := $(FIXPATH) $(JDK_OUTPUTDIR)/bin/rmic |
36 endif |
36 endif |
37 |
37 |
38 CLASSES_DIR := $(JDK_OUTPUTDIR)/classes |
38 CLASSES_DIR := $(JDK_OUTPUTDIR)/classes |
39 # NOTE: If the smart javac dependency management is reintroduced, these classes risk |
39 # NOTE: If the smart javac dependency management is reintroduced, these classes risk |
40 # interfering with the dependency checking. In that case they will need to be kept separate. |
40 # interfering with the dependency checking. In that case they will need to be kept separate. |
41 STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/rmicclasses |
41 STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes |
42 RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic |
42 RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic |
43 |
43 |
44 GENCLASSES := |
44 GENCLASSES := |
45 |
45 |
46 ########################################################################################## |
46 ########################################################################################## |
89 KEEP_GENERATED:=true)) |
89 KEEP_GENERATED:=true)) |
90 GENCLASSES += $(filter %.java,$(RMI_SRC)) |
90 GENCLASSES += $(filter %.java,$(RMI_SRC)) |
91 |
91 |
92 ########################################################################################## |
92 ########################################################################################## |
93 |
93 |
94 all: $(GENCLASSES) |
94 $(RMIC_GENSRC_DIR)/_the.classes.removed: $(GENCLASSES) |
95 $(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE) |
95 $(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE) |
96 $(CP) -rp $(STUB_CLASSES_DIR)/* $(CLASSES_DIR) |
96 $(TOUCH) $@ |
|
97 |
|
98 all: $(RMIC_GENSRC_DIR)/_the.classes.removed $(GENCLASSES) |
97 |
99 |
98 .PHONY: all |
100 .PHONY: all |