From c508e485ba1213ef05dc151e3d2c08cdf35010a4 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 1 Nov 2004 22:30:10 +0000 Subject: [PATCH] Removed COMMON_JAR, add rule to install existing jar, added jar vpath. --- configure/RULES_JAVA | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure/RULES_JAVA b/configure/RULES_JAVA index 2f37e57f6..1b7971cf5 100644 --- a/configure/RULES_JAVA +++ b/configure/RULES_JAVA @@ -20,10 +20,11 @@ JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(word 1, $(subst -, ,$(T_A))) -I$( JAVACCMD = $(subst \,/,$(JAVA_BIN)/javac$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVACFLAGS)) JAVAHCMD = $(subst \,/,$(JAVA_BIN)/javah$(EXE) -d $(COMMON_DIR) -force $(CLASSPATH) $(JAVAHFLAGS)) -JARCMD = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $(COMMON_JAR) $(JARINPUT) $(JARPACKAGES)) +JARCMD = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $@ $(JARINPUT) $(JARPACKAGES)) #------------------------------------------------------- vpath %.java .. +vpath %.jar .. $(COMMON_DIR) CLASSPATH=$(addprefix -classpath ,$(USR_PRECLASSPATH) $(INSTALL_JAVA) $(USR_CLASSPATH)) SOURCEPATH=-sourcepath .:..:../.. @@ -58,7 +59,6 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES)) #------------------------------------------------------- # Java jar file -COMMON_JAR += $(addprefix $(COMMON_DIR)/,$(JAR)) INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR)) JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST)) JARINPUT += $(subst .java,.class,$(JAR_INPUT)) @@ -95,7 +95,7 @@ inc: $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC) build: inc -build: $(COMMON_TESTCLASSES) $(COMMON_JAR) +build: $(COMMON_TESTCLASSES) buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC) @@ -103,7 +103,7 @@ buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC) clean:: @$(RMDIR) $(INSTALL_CLASSES) $(PACKAGEDIRS) @$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC) - @$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAR) $(COMMON_JAVAINC) + @$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAVAINC) ifdef JAVA_DIRECTORY_TARGETS $(JAVA_DIRECTORY_TARGETS): @@ -139,6 +139,10 @@ $(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar @echo "Installing java jar file $@" @$(INSTALL) -d -m 644 $< $(@D) +$(INSTALL_JAVA)/%.jar: %.jar + @echo "Installing java jar file $@" + @$(INSTALL) -d -m 644 $< $(@D) + .PHONY: all install buildInstall rebuild clean build inc .PRECIOUS: $(COMMON_JAVAINC)