From bd4b66de0704d975f0a3ab1bf90f46159188e588 Mon Sep 17 00:00:00 2001 From: Ken Evans Date: Thu, 28 Oct 2004 18:56:45 +0000 Subject: [PATCH] Fixed it up to remove package directories during clean. Was previously leaving generated classes (with $ in the name). --- configure/RULES_JAVA | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure/RULES_JAVA b/configure/RULES_JAVA index 3a14bbfb9..2f37e57f6 100644 --- a/configure/RULES_JAVA +++ b/configure/RULES_JAVA @@ -64,6 +64,7 @@ JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST)) JARINPUT += $(subst .java,.class,$(JAR_INPUT)) JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA))) $(JARINPUT) JARPACKAGES += $(foreach pkg,$(JAR_PACKAGES),-C $(INSTALL_JAVA) $(subst .,/,$(pkg))) +PACKAGEDIRS += $(foreach pkg,$(JAR_PACKAGES),$(addprefix $(INSTALL_JAVA)/,$(subst .,/,$(pkg)))) ifneq ($(JARMANIFEST),) JAR_OPTIONS = cvmf $(JARMANIFEST) @@ -100,7 +101,7 @@ buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC) #This clean works only from O.* dirs. clean:: - @$(RMDIR) $(INSTALL_CLASSES) + @$(RMDIR) $(INSTALL_CLASSES) $(PACKAGEDIRS) @$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC) @$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAR) $(COMMON_JAVAINC)