Don't create the java install directory until something actually needs it!
This commit is contained in:
+2
-10
@@ -463,11 +463,6 @@ endif #ifdef PROD
|
||||
# Java classes and packages
|
||||
#
|
||||
|
||||
DIRECTORY_TARGETS += $(INSTALL_JAVA)
|
||||
ifdef PACKAGE
|
||||
DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE)
|
||||
endif
|
||||
|
||||
vpath %.class $(INSTALL_JAVA)/$(PACKAGE)
|
||||
|
||||
CLASSES += $(subst .java,.class,$(JAVA))
|
||||
@@ -491,9 +486,6 @@ endif
|
||||
#JAR_DEPFILES += $(wildcard $(JAR_INPUT) $(addsuffix /*,$(JAR_INPUT)))
|
||||
JAR_DEPFILES += $(JAR_INPUT)
|
||||
|
||||
$(DIRECTORY_TARGETS) :
|
||||
$(MKDIR) $@
|
||||
|
||||
build:: $(TESTCLASSES) $(JAR)
|
||||
|
||||
buildInstall :: $(DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(INSTALL_JAR) $(INSTALL_JAVADOC)
|
||||
@@ -506,7 +498,7 @@ clean::
|
||||
$(RM) $@
|
||||
$(JAVACCMD) $<
|
||||
|
||||
$(INSTALL_JAVA)/$(PACKAGE)/%.class:%.java
|
||||
$(INSTALL_JAVA)/$(PACKAGE)/%.class:%.java $(INSTALL_JAVA)/$(PACKAGE)
|
||||
@echo Creating java class file $@
|
||||
@$(RM) $@
|
||||
$(JAVACCMD) -d $(INSTALL_JAVA) $<
|
||||
@@ -521,7 +513,7 @@ $(JAR):%.jar: $(JAR_DEPFILES)
|
||||
@$(RM) $@
|
||||
$(JARCMD)
|
||||
|
||||
$(INSTALL_JAVA)/%.jar: %.jar
|
||||
$(INSTALL_JAVA)/%.jar: %.jar $(INSTALL_JAVA)
|
||||
@echo "Installing jar file $@"
|
||||
@$(INSTALL) -d -m 644 $< $(@D)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user