From af6e7803ec8017bb35c064afcbeba19225c9472c Mon Sep 17 00:00:00 2001 From: Jeff Bezanson Date: Mon, 30 Jul 2012 15:55:08 -0400 Subject: [PATCH] restoring build of build_h.jl --- Makefile | 4 ---- base/Makefile | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 04e1b2314b449..140a1443c7517 100644 --- a/Makefile +++ b/Makefile @@ -21,10 +21,6 @@ julia-debug julia-release: @$(MAKE) -sC ui $@ @ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia -base/build_h.jl: Make.inc - @echo "_jl_libblas_name = \"$(LIBBLASNAME)\"" > $@ - @echo "_jl_liblapack_name = \"$(LIBLAPACKNAME)\"" >> $@ - $(BUILD)/lib/julia/helpdb.jl: doc/helpdb.jl | $(BUILD)/lib/julia @cp $< $@ diff --git a/base/Makefile b/base/Makefile index 1a37461d937de..d67f4bf15b4d8 100644 --- a/base/Makefile +++ b/base/Makefile @@ -3,7 +3,7 @@ include ../Make.inc PCRE_CONST = 0x[0-9a-fA-F]+|[-+]?\s*[0-9]+ -all: pcre_h.jl errno_h.jl os_detect.jl +all: pcre_h.jl errno_h.jl os_detect.jl build_h.jl pcre_h.jl: $(QUIET_PERL) ${CC} -E -dM $(shell $(PCRE_CONFIG) --prefix)/include/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = int32($$2)"' | sort > $@ @@ -14,8 +14,13 @@ errno_h.jl: os_detect.jl: ../src/os_detect.h $(QUIET_PERL) ${CC} -E -P -DJULIA ../src/os_detect.h | perl -p -e 's/\\n/\n/g' > $@ +build_h.jl: ../Make.inc + @echo "_jl_libblas_name = \"$(LIBBLASNAME)\"" > $@ + @echo "_jl_liblapack_name = \"$(LIBLAPACKNAME)\"" >> $@ + clean: rm -f *# *~ rm -f pcre_h.jl rm -f errno_h.jl rm -f os_detect.jl + rm -f build_h.jl