Skip to content

Commit

Permalink
Various Makefile improvements; make test now uses release build.
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanKarpinski committed Jun 14, 2011
1 parent 1232d72 commit bf72521
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
17 changes: 10 additions & 7 deletions Makefile
Expand Up @@ -13,24 +13,24 @@ julia-debug julia-release:
$(MAKE) -C ui $@
ln -f $@-$(DEFAULT_REPL) julia

sys.ji: ./j/sysimg.j ./j/start_image.j src/boot.j src/dump.c j/*.j
sys.ji: j/sysimg.j j/start_image.j src/boot.j src/dump.c j/*.j
./julia -b sysimg.j

PCRE_CONST = 0x[0-9a-fA-F]+|[-+]?\s*[0-9]+

j/pcre_h.j:
cpp -dM $(EXTROOT)/include/pcre.h | perl -nle '/^\s*#define\s+(PCRE\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "$$1 = $$2"' | sort > $@

test: debug
test: default
./julia test/tests.j

test-utf8:
test-utf8: default
./julia test/test_utf8.j

perf: release
test-perf: default
./julia test/perf.j

testall: test test-utf8 perf
test-all: test test-utf8 test-perf

SLOCCOUNT = sloccount \
--addlang makefile \
Expand All @@ -55,6 +55,9 @@ clean:
$(MAKE) -C ui clean

cleanall: clean
$(MAKE) -C src cleanother
$(MAKE) -C src clean-flisp clean-support

.PHONY: default debug release julia-debug julia-release test test-* testall sloccount clean cleanall
distclean: cleanall
$(MAKE) -C external cleanall

.PHONY: default debug release julia-debug julia-release test test-* sloccount clean cleanall
2 changes: 2 additions & 0 deletions external/Makefile
Expand Up @@ -200,3 +200,5 @@ cleanall-mongoose:

cleanall: $(addprefix cleanall-, $(LIBS))
rm -rf root

.PHONY: default compile install cleanall compile-* install-* cleanall-*
10 changes: 6 additions & 4 deletions src/Makefile
Expand Up @@ -76,10 +76,12 @@ clean:
rm -f *.o
rm -f *~ *#

cleanother:
$(MAKE) -C $(LLTDIR) clean
clean-flisp:
$(MAKE) -C $(FLISPDIR) clean

cleanall: clean cleanother
clean-support:
$(MAKE) -C $(LLTDIR) clean

cleanall: clean clean-flisp clean-support

.PHONY: debug release clean cleanall cleanother
.PHONY: debug release clean cleanall clean-*

0 comments on commit bf72521

Please sign in to comment.