Merge branch 'master' of kompiler.org:trs

pybison @ 45ab5b85

-Subproject commit 6114df1e41edf41a96b683a8dada8b327222da31
+Subproject commit 45ab5b854b56c021db3f63f7b4769c604e7aa2e3

external/rules.mk

@@ -4,13 +4,17 @@ PYBISON_INC := -Iexternal/pybison/src/c -I/usr/include/python2.7
 
 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 $@ $^
 
-$(b)pybison/bisondynlib-linux.o $(b)pybison/bison_.o: | $(b)pybison
+$(BISON_OBJ): | $(b)pybison
 	$(CC) $(CFLAGS) -o $@ -c $< -pthread -fPIC $(PYBISON_INC)
 
 $(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
 
 ifdef PYREX
@@ -24,6 +28,5 @@ endif
 endif
 
 $(b)pybison/%.c: $(d)pybison/src/pyrex/%.pyx
-	$(py2c) -o $@ $<
+	$(py2c) $(py2c_OPTS) -o $@ $<
 	$(RM) $(@D)/*.so
-