Skip to content

Commit

Permalink
restoring build of build_h.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
JeffBezanson committed Jul 30, 2012
1 parent 718f520 commit af6e780
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $< $@

Expand Down
7 changes: 6 additions & 1 deletion base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 > $@
Expand All @@ -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

0 comments on commit af6e780

Please sign in to comment.