Merge branch 'master' of git://github.com/JuliaLang/julia

raggi · Mar 10, 2012 · fea839e · fea839e
2 parents 31c4af2 + f5bbd1e
commit fea839e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -4,8 +4,8 @@ include $(JULIAHOME)/Make.inc
 default: release
 
 debug release:
-	$(MAKE) julia-$@
-	$(MAKE) sys.ji
+	@$(MAKE) -s julia-$@
+	@$(MAKE) -s sys.ji
 
 julia-debug julia-release:
 	@$(MAKE) -sC external
@@ -65,9 +65,6 @@ cleanall: clean
 
 distclean: cleanall
 
-#distclean: cleanall
-#	$(MAKE) -C external cleanall
-
 .PHONY: default debug release julia-debug julia-release \
 	test testall test-* sloccount clean cleanall
 

diff --git a/external/fdlibm/makefile b/external/fdlibm/makefile
@@ -100,7 +100,6 @@ all: libfdm.a
 
 libfdm.a : $(obj) 
 	ar cru libfdm.a $(obj)
-	ranlib libfdm.a
 
 source: $(src) readme