Skip to content

Commit

Permalink
Revert "Move custom.j under j/ with all other .j files."
Browse files Browse the repository at this point in the history
This reverts commit da03a00.

See commit bd7d3d1
  • Loading branch information
JeffBezanson committed May 12, 2011
1 parent 87bb0bd commit 66a1be1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
/libjulia-release.so
/libjulia-release.dylib

/custom.j
/sys.ji
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
JULIAHOME = $(shell pwd)

include Make.inc
include ./Make.inc

default: release

debug release: %: julia-% j/pcre_h.j j/custom.j sys.ji
debug release: %: julia-% j/pcre_h.j sys.ji custom.j

julia-debug julia-release:
$(MAKE) -C src lib$@
Expand All @@ -16,17 +16,17 @@ julia-debug julia-release:
ln -f ui/$@-readline .
ln -f ui/$@-basic .

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

custom.j:
if [ ! -f ./custom.j ]; then touch ./custom.j; fi

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 > $@

j/custom.j:
if [ ! -f $@ ]; then touch $@; fi

test: debug
./julia test/tests.j

Expand Down
2 changes: 1 addition & 1 deletion j/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/pcre_h.j
/custom.j
/sys.ji
2 changes: 1 addition & 1 deletion j/start_image.j
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ setenv("GOTO_NUM_THREADS", "1")
libBLAS = dlopen("libLAPACK")
libLAPACK = dlopen("libLAPACK")

load("j/custom.j")
load("custom.j")

0 comments on commit 66a1be1

Please sign in to comment.