epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Removed COMMON_JAR, add rule to install existing jar, added jar vpath.

Browse Source
This commit is contained in:
Janet B. Anderson
2004-11-01 22:30:10 +00:00
parent e700d00db0
commit c508e485ba
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure/RULES_JAVA
View File

@@ -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)