modure: Make sure that re1.5 compiled in only of modure itself is enabled.

pfalcon · pfalcon · commit 1606607bd42c · 2014-10-12T03:40:20.000+03:00
This is achieved by including re1.5 *.c files straight from modure.c .
diff --git a/extmod/modure.c b/extmod/modure.c
@@ -238,4 +238,12 @@ const mp_obj_module_t mp_module_ure = {
     .globals = (mp_obj_dict_t*)&mp_module_re_globals,
 };
 
+// Source files #include'd here to make sure they're compiled in
+// only if module is enabled by config setting.
+
+#define re1_5_fatal(x) assert(!x)
+#include "re1.5/compilecode.c"
+#include "re1.5/dumpcode.c"
+#include "re1.5/recursiveloop.c"
+
 #endif //MICROPY_PY_URE
diff --git a/py/py.mk b/py/py.mk
@@ -114,9 +114,6 @@ PY_O_BASENAME = \
 	../extmod/modzlibd.o \
 	../extmod/modujson.o \
 	../extmod/modure.o \
-	../extmod/re1.5/compilecode.o \
-	../extmod/re1.5/dumpcode.o \
-	../extmod/re1.5/recursiveloop.o \
 
 # prepend the build destination prefix to the py object files
 PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME))
@@ -169,7 +166,3 @@ $(PY_BUILD)/gc.o: CFLAGS += $(CSUPEROPT)
 
 # optimising vm for speed, adds only a small amount to code size but makes a huge difference to speed (20% faster)
 $(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT)
-
-# Additional options for 3rd-party libs
-
-$(PY_BUILD)/../extmod/re1.5/recursiveloop.o: CFLAGS += "-Dre1_5_fatal(x)=assert(!x)"
