From 48b2fac181f55b9a113efd4a714428f1c12b2663 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 27 Sep 2000 14:27:10 +0000
Subject: [PATCH] Added vpath for .java files. Added JAVA_DIRECTORY_TARGETS.

---
 configure/RULES_JAVA | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure/RULES_JAVA b/configure/RULES_JAVA
index efb06623f..6c1f247ac 100644
--- a/configure/RULES_JAVA
+++ b/configure/RULES_JAVA
@@ -7,12 +7,13 @@
 ifdef JAVA
 
 INSTALL_JAVA = $(INSTALL_LOCATION)/javalib
-DIRECTORY_TARGETS += $(INSTALL_JAVA)
+JAVA_DIRECTORY_TARGETS += $(INSTALL_JAVA)
 ifdef PACKAGE
-DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE)
+JAVA_DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE)
 endif #ifdef PACKAGE
 
 vpath %.class $(INSTALL_JAVA)/$(PACKAGE)
+vpath %.java .. 
 
 CLASSES += $(subst .java,.class,$(JAVA))
 TESTCLASSES += $(subst .java,.class,$(TESTJAVA))
@@ -25,16 +26,16 @@ JAR_OPTIONS = cvmf
 endif
 JAR_DEPFILES +=  $(wildcard $(JAR_INPUT) $(addsuffix /*,$(JAR_INPUT)))
 
-$(DIRECTORY_TARGETS) :
-#	$(MKDIR) -p $@
-
 build: $(TESTCLASSES) $(JAR)
 
-buildInstall : $(DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(INSTALL_JAR)
+buildInstall : $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(INSTALL_JAR)
 
 clean::
 	@$(RM) $(TESTCLASSES) $(JAR)
 
+$(JAVA_DIRECTORY_TARGETS):
+	$(MKDIR) -p $@
+
 %.class:%.java
 	@echo Creating java class file $@
 	$(RM) $@