From 93aab3cf13186cfeb47e5ed3d9f0f4904e2389aa Mon Sep 17 00:00:00 2001
From: paltherr <paltherr@epfl.ch>
Date: Tue, 21 Sep 2004 15:10:47 +0000
Subject: - Relocated jar files under PROJECT_OBJECTDIR

---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0b1ce435de..dd1a79f6c5 100644
--- a/Makefile
+++ b/Makefile
@@ -406,7 +406,7 @@ LIBRARY_SDC_FLAGS	+= -windowtitle "Scala Library Documentation"
 LIBRARY_SDC_FLAGS	+= -doctitle "Scala<br/>$(PROJECT_VERSION)"
 LIBRARY_SDC_FILES	+= $(LIBRARY_SC_FILES)
 LIBRARY_SDC_OUTPUTDIR	 = $(PROJECT_APIDOCDIR)
-LIBRARY_JAR_ARCHIVE	 = $(PROJECT_LIBRARYDIR)/$(PROJECT_NAME).jar
+LIBRARY_JAR_ARCHIVE	 = $(LIBRARY_CLASSDIR).jar
 LIBRARY_JAR_INPUTDIR	 = $(LIBRARY_CLASSDIR)
 LIBRARY_JAR_FILES	+= .
 
@@ -431,10 +431,14 @@ $(latest)library-sdc	: $(LIBRARY_SDC_FILES)
 	@$(make) sdc target=LIBRARY
 	$(TOUCH) $@
 
+ifneq ($(LIBRARY_JAR_ARCHIVE),.jar)
+
 $(LIBRARY_JAR_ARCHIVE)	: $(latest)library
 $(LIBRARY_JAR_ARCHIVE)	:
 	@$(make) jar target=LIBRARY
 
+endif
+
 ##############################################################################
 # Targets - scala library
 
@@ -657,14 +661,10 @@ $(latest)servlet-sc	: $(SERVLET_SC_FILES)
 
 TOOLS_NAME		 = tools
 TOOLS_CLASSDIR		 = $($(prefix)_TOOLS_CLASSDIR)
-TOOLS_JAR_ARCHIVE	 = $(PROJECT_LIBRARYDIR)/$(TOOLS_NAME).jar
+TOOLS_JAR_ARCHIVE	 = $(TOOLS_CLASSDIR).jar
 TOOLS_JAR_INPUTDIR	 = $(TOOLS_CLASSDIR)
 TOOLS_JAR_FILES		+= .
 
-distclean		: distclean.tools
-distclean.tools	:
-	$(RM) $(TOOLS_JAR_ARCHIVE)
-
 $(latest)tools		: $(latest)lamplib
 $(latest)tools		: $(latest)util
 $(latest)tools		: $(latest)scalac
@@ -678,10 +678,14 @@ $(latest)tools		: $(latest)servlet
 $(latest)tools		:
 	$(TOUCH) $@
 
+ifneq ($(TOOLS_JAR_ARCHIVE),.jar)
+
 $(TOOLS_JAR_ARCHIVE)	: $(latest)tools
 $(TOOLS_JAR_ARCHIVE)	:
 	@$(make) jar target=TOOLS
 
+endif
+
 ##############################################################################
 # Targets - template expansion
 
-- 
cgit v1.2.3