Skip to content

T
trs
Commit 2ac45d25 authored by Sander Mathijs van Veen's avatar Sander Mathijs van Veen
Browse files
Options

Updated pybison and adjusted build system accordingly.

parent eb260889
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
pybison @ 45ab5b85
Subproject commit 6114df1e41edf41a96b683a8dada8b327222da31 Subproject commit 45ab5b854b56c021db3f63f7b4769c604e7aa2e3
external/rules.mk
View file @ 2ac45d25
...@@ -4,13 +4,17 @@ PYBISON_INC := -Iexternal/pybison/src/c -I/usr/include/python2.7 ...@@ -4,13 +4,17 @@ PYBISON_INC := -Iexternal/pybison/src/c -I/usr/include/python2.7
build: $(b)pybison/bison_.so build: $(b)pybison/bison_.so
$(b)pybison/bison_.so: $(b)pybison/bison_.o $(b)pybison/bisondynlib-linux.o BISON_OBJ := $(b)pybison/bison_.o $(b)pybison/bison_callback.o \
$(b)pybison/bisondynlib-linux.o
$(b)pybison/bison_.so: $(BISON_OBJ)
$(CC) $(CFLAGS) -shared -pthread -o $@ $^ $(CC) $(CFLAGS) -shared -pthread -o $@ $^
$(b)pybison/bisondynlib-linux.o $(b)pybison/bison_.o: | $(b)pybison $(BISON_OBJ): | $(b)pybison
$(CC) $(CFLAGS) -o $@ -c $< -pthread -fPIC $(PYBISON_INC) $(CC) $(CFLAGS) -o $@ -c $< -pthread -fPIC $(PYBISON_INC)
$(b)pybison/bisondynlib-linux.o: $(d)pybison/src/c/bisondynlib-linux.c $(b)pybison/bisondynlib-linux.o: $(d)pybison/src/c/bisondynlib-linux.c
$(b)pybison/bison_callback.o: $(d)pybison/src/c/bison_callback.c
$(b)pybison/bison_.o: $(b)pybison/bison_.c $(b)pybison/bison_.o: $(b)pybison/bison_.c
ifdef PYREX ifdef PYREX
...@@ -24,6 +28,5 @@ endif ...@@ -24,6 +28,5 @@ endif
endif endif
$(b)pybison/%.c: $(d)pybison/src/pyrex/%.pyx $(b)pybison/%.c: $(d)pybison/src/pyrex/%.pyx
$(py2c) -o $@ $< $(py2c) $(py2c_OPTS) -o $@ $<
$(RM) $(@D)/*.so $(RM) $(@D)/*.so
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment