189 @$(RM) $(JAVA_SOURCE_LIST) |
189 @$(RM) $(JAVA_SOURCE_LIST) |
190 |
190 |
191 # Make sure all newer sources are compiled (in a batch) |
191 # Make sure all newer sources are compiled (in a batch) |
192 classes : $(CLASSES_INIT) .delete.classlist .compile.classlist |
192 classes : $(CLASSES_INIT) .delete.classlist .compile.classlist |
193 |
193 |
|
194 # Use this javac option to force it to favor the sourcepath file classes |
|
195 # rather than any bootclasspath classes. |
|
196 JAVAC_PREFER_SOURCE = -Xprefer:source |
|
197 |
194 .compile.classlist : $(JAVA_SOURCE_LIST) |
198 .compile.classlist : $(JAVA_SOURCE_LIST) |
195 @$(MKDIR) -p $(CLASSDESTDIR) |
199 @$(MKDIR) -p $(CLASSDESTDIR) |
196 @if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \ |
200 @if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \ |
197 $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ |
201 $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ |
198 $(CAT) $(JAVA_SOURCE_LIST); \ |
202 $(CAT) $(JAVA_SOURCE_LIST); \ |
199 $(ECHO) "# Running javac:"; \ |
203 $(ECHO) "# Running javac:"; \ |
200 $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ |
204 $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ |
201 $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ |
205 $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ |
202 fi |
206 fi |
203 @$(java-vm-cleanup) |
207 @$(java-vm-cleanup) |
204 |
208 |
205 clobber clean:: |
209 clobber clean:: |
206 $(RM) $(JAVA_SOURCE_LIST) |
210 $(RM) $(JAVA_SOURCE_LIST) |