Commit 50fe5ac92f7a4dcf2919bacd772bb69fda2ba187

Thomas de Grivel 2023-01-24T16:37:10

make gen && ./configure

diff --git a/Makefile b/Makefile
index a1f7ffb..499eb95 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,9 @@ gdb_ic3: debug
 gdb_test: debug
 	${MAKE} -C test gdb_test
 
+gen:
+	${MAKE} -C libc3 gen
+
 ic3_gcovr:
 	${MAKE} clean_cov
 	${MAKE} ic3_test_cov
diff --git a/libc3/Makefile b/libc3/Makefile
index d00a62c..d2fd7e1 100644
--- a/libc3/Makefile
+++ b/libc3/Makefile
@@ -16,6 +16,17 @@ CLEANFILES = *.a *.gcno *.la .libs *.lo *.o
 CLEANFILES_COV = *.css *.gcda *.html .libs/*.gcda
 CLEANFILES += ${CLEANFILES_COV}
 
+GENERATED_FILES = \
+	set__fact.c set__fact.h \
+	set__tag.c set__tag.h \
+	set_cursor__fact.c set_cursor__fact.h \
+	set_cursor__tag.c set_cursor__tag.h \
+	set_item__fact.c set_item__fact.h \
+	set_item__tag.c set_item__tag.h \
+	skiplist__fact.c skiplist__fact.h \
+	skiplist_node__fact.c skiplist_node__fact.h
+CLEANFILES += ${GENERATED_FILES}
+
 DISTCLEANFILES = ${CLEANFILES} config.mk
 
 build: libc3.la libc3.a
@@ -44,50 +55,11 @@ distclean:
 gcovr:
 	gcovr --gcov-executable ${GCOV} --html-details libc3.html
 
-install:
-	mkdir -p ${prefix}/include/c3
-	install -m 644 arg.h ${prefix}/include/c3/
-	install -m 644 bool.h ${prefix}/include/c3/
-	install -m 644 buf.h ${prefix}/include/c3/
-	install -m 644 buf_file.h ${prefix}/include/c3/
-	install -m 644 buf_inspect.h ${prefix}/include/c3/
-	install -m 644 buf_parse.h ${prefix}/include/c3/
-	install -m 644 buf_save.h ${prefix}/include/c3/
-	install -m 644 c3.h ${prefix}/include/c3/
-	install -m 644 call.h ${prefix}/include/c3/
-	install -m 644 character.h ${prefix}/include/c3/
-	install -m 644 compare.h ${prefix}/include/c3/
-	install -m 644 debug.h ${prefix}/include/c3/
-	install -m 644 env.h ${prefix}/include/c3/
-	install -m 644 eval.h ${prefix}/include/c3/
-	install -m 644 fact.h ${prefix}/include/c3/
-	install -m 644 facts.h ${prefix}/include/c3/
-	install -m 644 fn.h ${prefix}/include/c3/
-	install -m 644 hash.h ${prefix}/include/c3/
-	install -m 644 ident.h ${prefix}/include/c3/
-	install -m 644 integer.h ${prefix}/include/c3/
-	install -m 644 list.h ${prefix}/include/c3/
-	install -m 644 quote.h ${prefix}/include/c3/
-	install -m 644 str.h ${prefix}/include/c3/
-	install -m 644 tag.h ${prefix}/include/c3/
-	install -m 644 tuple.h ${prefix}/include/c3/
-	install -m 644 ucd.h ${prefix}/include/c3/
-	mkdir -p ${prefix}/lib
-	libtool install libc3.la ${prefix}/lib
-
-libc3.a: libc3.la
-	cp .libs/libc3.a ./
-
-libc3_asan.a: libc3_asan.la
-	cp .libs/libc3_asan.a ./
+gen: ${GENERATED_FILES}
 
-libc3_cov.a: libc3_cov.la
-	cp .libs/libc3_cov.a ./
-
-libc3_debug.a: libc3_debug.la
-	cp .libs/libc3_debug.a ./
-
-SED_FACT = sed -e 's/_NAME[$$]/fact/g' -e 's/_TYPE[$$]/s_fact/g'
+SED_FACT = sed \
+	-e 's/_NAME[$$]/fact/g' \
+	-e 's/_TYPE[$$]/s_fact/g'
 set_cursor__fact.h: set_cursor.h.in Makefile
 	${SED_FACT} < set_cursor.h.in > set_cursor__fact.h
 set_cursor__fact.c: set_cursor.c.in Makefile
@@ -100,8 +72,9 @@ set_item__fact.h: set_item.h.in Makefile
 	${SED_FACT} < set_item.h.in > set_item__fact.h
 set_item__fact.c: set_item.c.in Makefile
 	${SED_FACT} < set_item.c.in > set_item__fact.c
-
-SED_FACT_P = sed -e 's/_NAME[$$]/fact/g' -e 's/_TYPE[$$]/s_fact */g'
+SED_FACT_P = sed \
+	-e 's/_NAME[$$]/fact/g' \
+	-e 's/_TYPE[$$]/s_fact */g'
 skiplist__fact.h: skiplist.h.in Makefile
 	${SED_FACT_P} < skiplist.h.in > skiplist__fact.h
 skiplist__fact.c: skiplist.c.in Makefile
@@ -110,8 +83,9 @@ skiplist_node__fact.h: skiplist_node.h.in Makefile
 	${SED_FACT_P} < skiplist_node.h.in > skiplist_node__fact.h
 skiplist_node__fact.c: skiplist_node.c.in Makefile
 	${SED_FACT_P} < skiplist_node.c.in > skiplist_node__fact.c
-
-SED_TAG = sed -e 's/_NAME[$$]/tag/g' -e 's/_TYPE[$$]/s_tag/g'
+SED_TAG = sed \
+	-e 's/_NAME[$$]/tag/g' \
+	-e 's/_TYPE[$$]/s_tag/g'
 set_cursor__tag.h: set_cursor.h.in Makefile
 	${SED_TAG} < set_cursor.h.in > set_cursor__tag.h
 set_cursor__tag.c: set_cursor.c.in Makefile
@@ -125,12 +99,30 @@ set__tag.h: set.h.in Makefile
 set__tag.c: set.c.in Makefile
 	${SED_TAG} < set.c.in > set__tag.c
 
+install:
+	${INSTALL} -o ${OWNER} -g ${GROUP} -m 0755 -d ${prefix}/include
+	${LIBTOOL} --tag=CC --mode=install ${INSTALL} -o ${OWNER} -g ${GROUP} -m 0644 ${HEADERS} ${prefix}/include/c3
+	${INSTALL} -o ${OWNER} -g ${GROUP} -m 0755 -d ${prefix}/lib
+	${LIBTOOL} --tag=CC --mode=install ${INSTALL} -o ${OWNER} -g ${GROUP} -m 0644 ${LIB} ${prefix}/lib
+
+libc3.a: libc3.la
+	cp .libs/libc3.a ./
+
+libc3_asan.a: libc3_asan.la
+	cp .libs/libc3_asan.a ./
+
+libc3_cov.a: libc3_cov.la
+	cp .libs/libc3_cov.a ./
+
+libc3_debug.a: libc3_debug.la
+	cp .libs/libc3_debug.a ./
+
 test:
 
 update_sources:
 	./update_sources
 
-.PHONY: all asan build clean cov debug distclean install test update_sources
+.PHONY: all asan build clean cov debug distclean gen install test update_sources
 
 include config.mk
 include sources.mk
diff --git a/libc3/configure b/libc3/configure
index 5e7c70a..0f97939 100755
--- a/libc3/configure
+++ b/libc3/configure
@@ -101,11 +101,6 @@ echo >> ${CONFIG_MK}
 echo "$LIB_DEBUG: $OBJECTS_DEBUG" >> ${CONFIG_MK}
 echo "	${LIBTOOL} --tag=CC --mode=link \${CC} \${LDFLAGS_DEBUG} ${OBJECTS_DEBUG} \${LIBS_DEBUG} -o ${LIB_DEBUG}" >> ${CONFIG_MK}
 
-echo >> ${CONFIG_MK}
-echo "install: ${LIB}" >> ${CONFIG_MK}
-echo "	\${INSTALL} -o \${OWNER} -g \${GROUP} -m 0755 -d \${prefix}/lib" >> ${CONFIG_MK}
-echo "	\${LIBTOOL} --tag=CC --mode=install \${INSTALL} -o \${OWNER} -g \${GROUP} -m 0755 ${LIB} \${prefix}/lib" >> ${CONFIG_MK}
-
 for SRC in $SOURCES; do
     echo >> ${CONFIG_MK}
     SRC_LO="$(c2ext .main.lo "$SRC")"
diff --git a/libc3/set_cursor__fact.h b/libc3/set_cursor__fact.h
index 549d254..8fce6f0 100644
--- a/libc3/set_cursor__fact.h
+++ b/libc3/set_cursor__fact.h
@@ -11,6 +11,7 @@
  * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
  * THIS SOFTWARE.
  */
+/* Gen from set_cursor.h.in NAME=fact TYPE=s_fact */
 #ifndef SET_CURSOR__fact_H
 #define SET_CURSOR__fact_H
 
diff --git a/libc3/set_cursor__tag.h b/libc3/set_cursor__tag.h
index 85ac989..2cd2dcc 100644
--- a/libc3/set_cursor__tag.h
+++ b/libc3/set_cursor__tag.h
@@ -11,6 +11,7 @@
  * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
  * THIS SOFTWARE.
  */
+/* Gen from set_cursor.h.in NAME=tag TYPE=s_tag */
 #ifndef SET_CURSOR__tag_H
 #define SET_CURSOR__tag_H
 
diff --git a/libc3/sources.mk b/libc3/sources.mk
index 356db4b..1aa6e22 100644
--- a/libc3/sources.mk
+++ b/libc3/sources.mk
@@ -1,3 +1,4 @@
 # sources.mk generated by update_sources
+HEADERS = arg.h binding.h bool.h buf.h buf_file.h buf_inspect.h buf_parse.h buf_parse_c.h buf_save.h c3.h c_types.h call.h character.h compare.h debug.h env.h error.h error_handler.h eval.h fact.h facts.h facts_cursor.h facts_spec.h facts_spec_cursor.h facts_with.h facts_with_cursor.h fn.h frame.h hash.h ident.h integer.h list.h log.h module.h quote.h set__fact.h set__tag.h set_cursor__fact.h set_cursor__tag.h set_item__fact.h set_item__tag.h skiplist__fact.h skiplist_node__fact.h str.h sym.h tag.h tuple.h types.h ucd.h 
 SOURCES = arg.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_parse.c buf_parse_c.c buf_save.c c3.c call.c character.c compare.c debug.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c list.c log.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c ucd.c 
 LO_SOURCES = arg.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_parse.c buf_parse_c.c buf_save.c c3.c call.c character.c compare.c debug.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c list.c log.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c ucd.c  ../libtommath/bn_cutoffs.c ../libtommath/bn_deprecated.c ../libtommath/bn_mp_2expt.c ../libtommath/bn_mp_abs.c ../libtommath/bn_mp_add.c ../libtommath/bn_mp_add_d.c ../libtommath/bn_mp_addmod.c ../libtommath/bn_mp_and.c ../libtommath/bn_mp_clamp.c ../libtommath/bn_mp_clear.c ../libtommath/bn_mp_clear_multi.c ../libtommath/bn_mp_cmp.c ../libtommath/bn_mp_cmp_d.c ../libtommath/bn_mp_cmp_mag.c ../libtommath/bn_mp_cnt_lsb.c ../libtommath/bn_mp_complement.c ../libtommath/bn_mp_copy.c ../libtommath/bn_mp_count_bits.c ../libtommath/bn_mp_decr.c ../libtommath/bn_mp_div.c ../libtommath/bn_mp_div_2.c ../libtommath/bn_mp_div_2d.c ../libtommath/bn_mp_div_3.c ../libtommath/bn_mp_div_d.c ../libtommath/bn_mp_dr_is_modulus.c ../libtommath/bn_mp_dr_reduce.c ../libtommath/bn_mp_dr_setup.c ../libtommath/bn_mp_error_to_string.c ../libtommath/bn_mp_exch.c ../libtommath/bn_mp_expt_u32.c ../libtommath/bn_mp_exptmod.c ../libtommath/bn_mp_exteuclid.c ../libtommath/bn_mp_fread.c ../libtommath/bn_mp_from_sbin.c ../libtommath/bn_mp_from_ubin.c ../libtommath/bn_mp_fwrite.c ../libtommath/bn_mp_gcd.c ../libtommath/bn_mp_get_double.c ../libtommath/bn_mp_get_i32.c ../libtommath/bn_mp_get_i64.c ../libtommath/bn_mp_get_l.c ../libtommath/bn_mp_get_ll.c ../libtommath/bn_mp_get_mag_u32.c ../libtommath/bn_mp_get_mag_u64.c ../libtommath/bn_mp_get_mag_ul.c ../libtommath/bn_mp_get_mag_ull.c ../libtommath/bn_mp_grow.c ../libtommath/bn_mp_incr.c ../libtommath/bn_mp_init.c ../libtommath/bn_mp_init_copy.c ../libtommath/bn_mp_init_i32.c ../libtommath/bn_mp_init_i64.c ../libtommath/bn_mp_init_l.c ../libtommath/bn_mp_init_ll.c ../libtommath/bn_mp_init_multi.c ../libtommath/bn_mp_init_set.c ../libtommath/bn_mp_init_size.c ../libtommath/bn_mp_init_u32.c ../libtommath/bn_mp_init_u64.c ../libtommath/bn_mp_init_ul.c ../libtommath/bn_mp_init_ull.c ../libtommath/bn_mp_invmod.c ../libtommath/bn_mp_is_square.c ../libtommath/bn_mp_iseven.c ../libtommath/bn_mp_isodd.c ../libtommath/bn_mp_kronecker.c ../libtommath/bn_mp_lcm.c ../libtommath/bn_mp_log_u32.c ../libtommath/bn_mp_lshd.c ../libtommath/bn_mp_mod.c ../libtommath/bn_mp_mod_2d.c ../libtommath/bn_mp_mod_d.c ../libtommath/bn_mp_montgomery_calc_normalization.c ../libtommath/bn_mp_montgomery_reduce.c ../libtommath/bn_mp_montgomery_setup.c ../libtommath/bn_mp_mul.c ../libtommath/bn_mp_mul_2.c ../libtommath/bn_mp_mul_2d.c ../libtommath/bn_mp_mul_d.c ../libtommath/bn_mp_mulmod.c ../libtommath/bn_mp_neg.c ../libtommath/bn_mp_or.c ../libtommath/bn_mp_pack.c ../libtommath/bn_mp_pack_count.c ../libtommath/bn_mp_prime_fermat.c ../libtommath/bn_mp_prime_frobenius_underwood.c ../libtommath/bn_mp_prime_is_prime.c ../libtommath/bn_mp_prime_miller_rabin.c ../libtommath/bn_mp_prime_next_prime.c ../libtommath/bn_mp_prime_rabin_miller_trials.c ../libtommath/bn_mp_prime_rand.c ../libtommath/bn_mp_prime_strong_lucas_selfridge.c ../libtommath/bn_mp_radix_size.c ../libtommath/bn_mp_radix_smap.c ../libtommath/bn_mp_rand.c ../libtommath/bn_mp_read_radix.c ../libtommath/bn_mp_reduce.c ../libtommath/bn_mp_reduce_2k.c ../libtommath/bn_mp_reduce_2k_l.c ../libtommath/bn_mp_reduce_2k_setup.c ../libtommath/bn_mp_reduce_2k_setup_l.c ../libtommath/bn_mp_reduce_is_2k.c ../libtommath/bn_mp_reduce_is_2k_l.c ../libtommath/bn_mp_reduce_setup.c ../libtommath/bn_mp_root_u32.c ../libtommath/bn_mp_rshd.c ../libtommath/bn_mp_sbin_size.c ../libtommath/bn_mp_set.c ../libtommath/bn_mp_set_i32.c ../libtommath/bn_mp_set_i64.c ../libtommath/bn_mp_set_l.c ../libtommath/bn_mp_set_ll.c ../libtommath/bn_mp_set_u32.c ../libtommath/bn_mp_set_u64.c ../libtommath/bn_mp_set_ul.c ../libtommath/bn_mp_set_ull.c ../libtommath/bn_mp_shrink.c ../libtommath/bn_mp_signed_rsh.c ../libtommath/bn_mp_sqr.c ../libtommath/bn_mp_sqrmod.c ../libtommath/bn_mp_sqrt.c ../libtommath/bn_mp_sqrtmod_prime.c ../libtommath/bn_mp_sub.c ../libtommath/bn_mp_sub_d.c ../libtommath/bn_mp_submod.c ../libtommath/bn_mp_to_radix.c ../libtommath/bn_mp_to_sbin.c ../libtommath/bn_mp_to_ubin.c ../libtommath/bn_mp_ubin_size.c ../libtommath/bn_mp_unpack.c ../libtommath/bn_mp_xor.c ../libtommath/bn_mp_zero.c ../libtommath/bn_prime_tab.c ../libtommath/bn_s_mp_add.c ../libtommath/bn_s_mp_balance_mul.c ../libtommath/bn_s_mp_exptmod.c ../libtommath/bn_s_mp_exptmod_fast.c ../libtommath/bn_s_mp_get_bit.c ../libtommath/bn_s_mp_invmod_fast.c ../libtommath/bn_s_mp_invmod_slow.c ../libtommath/bn_s_mp_karatsuba_mul.c ../libtommath/bn_s_mp_karatsuba_sqr.c ../libtommath/bn_s_mp_montgomery_reduce_fast.c ../libtommath/bn_s_mp_mul_digs.c ../libtommath/bn_s_mp_mul_digs_fast.c ../libtommath/bn_s_mp_mul_high_digs.c ../libtommath/bn_s_mp_mul_high_digs_fast.c ../libtommath/bn_s_mp_prime_is_divisible.c ../libtommath/bn_s_mp_rand_jenkins.c ../libtommath/bn_s_mp_reverse.c ../libtommath/bn_s_mp_sqr.c ../libtommath/bn_s_mp_sqr_fast.c ../libtommath/bn_s_mp_sub.c ../libtommath/bn_s_mp_toom_mul.c ../libtommath/bn_s_mp_toom_sqr.c 
diff --git a/libc3/sources.sh b/libc3/sources.sh
index 8c2cb53..f6ce2ca 100644
--- a/libc3/sources.sh
+++ b/libc3/sources.sh
@@ -1,3 +1,4 @@
 # sources.sh generated by update_sources
+HEADERS='arg.h binding.h bool.h buf.h buf_file.h buf_inspect.h buf_parse.h buf_parse_c.h buf_save.h c3.h c_types.h call.h character.h compare.h debug.h env.h error.h error_handler.h eval.h fact.h facts.h facts_cursor.h facts_spec.h facts_spec_cursor.h facts_with.h facts_with_cursor.h fn.h frame.h hash.h ident.h integer.h list.h log.h module.h quote.h set__fact.h set__tag.h set_cursor__fact.h set_cursor__tag.h set_item__fact.h set_item__tag.h skiplist__fact.h skiplist_node__fact.h str.h sym.h tag.h tuple.h types.h ucd.h '
 SOURCES='arg.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_parse.c buf_parse_c.c buf_save.c c3.c call.c character.c compare.c debug.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c list.c log.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c ucd.c '
 LO_SOURCES='arg.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_parse.c buf_parse_c.c buf_save.c c3.c call.c character.c compare.c debug.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c list.c log.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c ucd.c  ../libtommath/bn_cutoffs.c ../libtommath/bn_deprecated.c ../libtommath/bn_mp_2expt.c ../libtommath/bn_mp_abs.c ../libtommath/bn_mp_add.c ../libtommath/bn_mp_add_d.c ../libtommath/bn_mp_addmod.c ../libtommath/bn_mp_and.c ../libtommath/bn_mp_clamp.c ../libtommath/bn_mp_clear.c ../libtommath/bn_mp_clear_multi.c ../libtommath/bn_mp_cmp.c ../libtommath/bn_mp_cmp_d.c ../libtommath/bn_mp_cmp_mag.c ../libtommath/bn_mp_cnt_lsb.c ../libtommath/bn_mp_complement.c ../libtommath/bn_mp_copy.c ../libtommath/bn_mp_count_bits.c ../libtommath/bn_mp_decr.c ../libtommath/bn_mp_div.c ../libtommath/bn_mp_div_2.c ../libtommath/bn_mp_div_2d.c ../libtommath/bn_mp_div_3.c ../libtommath/bn_mp_div_d.c ../libtommath/bn_mp_dr_is_modulus.c ../libtommath/bn_mp_dr_reduce.c ../libtommath/bn_mp_dr_setup.c ../libtommath/bn_mp_error_to_string.c ../libtommath/bn_mp_exch.c ../libtommath/bn_mp_expt_u32.c ../libtommath/bn_mp_exptmod.c ../libtommath/bn_mp_exteuclid.c ../libtommath/bn_mp_fread.c ../libtommath/bn_mp_from_sbin.c ../libtommath/bn_mp_from_ubin.c ../libtommath/bn_mp_fwrite.c ../libtommath/bn_mp_gcd.c ../libtommath/bn_mp_get_double.c ../libtommath/bn_mp_get_i32.c ../libtommath/bn_mp_get_i64.c ../libtommath/bn_mp_get_l.c ../libtommath/bn_mp_get_ll.c ../libtommath/bn_mp_get_mag_u32.c ../libtommath/bn_mp_get_mag_u64.c ../libtommath/bn_mp_get_mag_ul.c ../libtommath/bn_mp_get_mag_ull.c ../libtommath/bn_mp_grow.c ../libtommath/bn_mp_incr.c ../libtommath/bn_mp_init.c ../libtommath/bn_mp_init_copy.c ../libtommath/bn_mp_init_i32.c ../libtommath/bn_mp_init_i64.c ../libtommath/bn_mp_init_l.c ../libtommath/bn_mp_init_ll.c ../libtommath/bn_mp_init_multi.c ../libtommath/bn_mp_init_set.c ../libtommath/bn_mp_init_size.c ../libtommath/bn_mp_init_u32.c ../libtommath/bn_mp_init_u64.c ../libtommath/bn_mp_init_ul.c ../libtommath/bn_mp_init_ull.c ../libtommath/bn_mp_invmod.c ../libtommath/bn_mp_is_square.c ../libtommath/bn_mp_iseven.c ../libtommath/bn_mp_isodd.c ../libtommath/bn_mp_kronecker.c ../libtommath/bn_mp_lcm.c ../libtommath/bn_mp_log_u32.c ../libtommath/bn_mp_lshd.c ../libtommath/bn_mp_mod.c ../libtommath/bn_mp_mod_2d.c ../libtommath/bn_mp_mod_d.c ../libtommath/bn_mp_montgomery_calc_normalization.c ../libtommath/bn_mp_montgomery_reduce.c ../libtommath/bn_mp_montgomery_setup.c ../libtommath/bn_mp_mul.c ../libtommath/bn_mp_mul_2.c ../libtommath/bn_mp_mul_2d.c ../libtommath/bn_mp_mul_d.c ../libtommath/bn_mp_mulmod.c ../libtommath/bn_mp_neg.c ../libtommath/bn_mp_or.c ../libtommath/bn_mp_pack.c ../libtommath/bn_mp_pack_count.c ../libtommath/bn_mp_prime_fermat.c ../libtommath/bn_mp_prime_frobenius_underwood.c ../libtommath/bn_mp_prime_is_prime.c ../libtommath/bn_mp_prime_miller_rabin.c ../libtommath/bn_mp_prime_next_prime.c ../libtommath/bn_mp_prime_rabin_miller_trials.c ../libtommath/bn_mp_prime_rand.c ../libtommath/bn_mp_prime_strong_lucas_selfridge.c ../libtommath/bn_mp_radix_size.c ../libtommath/bn_mp_radix_smap.c ../libtommath/bn_mp_rand.c ../libtommath/bn_mp_read_radix.c ../libtommath/bn_mp_reduce.c ../libtommath/bn_mp_reduce_2k.c ../libtommath/bn_mp_reduce_2k_l.c ../libtommath/bn_mp_reduce_2k_setup.c ../libtommath/bn_mp_reduce_2k_setup_l.c ../libtommath/bn_mp_reduce_is_2k.c ../libtommath/bn_mp_reduce_is_2k_l.c ../libtommath/bn_mp_reduce_setup.c ../libtommath/bn_mp_root_u32.c ../libtommath/bn_mp_rshd.c ../libtommath/bn_mp_sbin_size.c ../libtommath/bn_mp_set.c ../libtommath/bn_mp_set_i32.c ../libtommath/bn_mp_set_i64.c ../libtommath/bn_mp_set_l.c ../libtommath/bn_mp_set_ll.c ../libtommath/bn_mp_set_u32.c ../libtommath/bn_mp_set_u64.c ../libtommath/bn_mp_set_ul.c ../libtommath/bn_mp_set_ull.c ../libtommath/bn_mp_shrink.c ../libtommath/bn_mp_signed_rsh.c ../libtommath/bn_mp_sqr.c ../libtommath/bn_mp_sqrmod.c ../libtommath/bn_mp_sqrt.c ../libtommath/bn_mp_sqrtmod_prime.c ../libtommath/bn_mp_sub.c ../libtommath/bn_mp_sub_d.c ../libtommath/bn_mp_submod.c ../libtommath/bn_mp_to_radix.c ../libtommath/bn_mp_to_sbin.c ../libtommath/bn_mp_to_ubin.c ../libtommath/bn_mp_ubin_size.c ../libtommath/bn_mp_unpack.c ../libtommath/bn_mp_xor.c ../libtommath/bn_mp_zero.c ../libtommath/bn_prime_tab.c ../libtommath/bn_s_mp_add.c ../libtommath/bn_s_mp_balance_mul.c ../libtommath/bn_s_mp_exptmod.c ../libtommath/bn_s_mp_exptmod_fast.c ../libtommath/bn_s_mp_get_bit.c ../libtommath/bn_s_mp_invmod_fast.c ../libtommath/bn_s_mp_invmod_slow.c ../libtommath/bn_s_mp_karatsuba_mul.c ../libtommath/bn_s_mp_karatsuba_sqr.c ../libtommath/bn_s_mp_montgomery_reduce_fast.c ../libtommath/bn_s_mp_mul_digs.c ../libtommath/bn_s_mp_mul_digs_fast.c ../libtommath/bn_s_mp_mul_high_digs.c ../libtommath/bn_s_mp_mul_high_digs_fast.c ../libtommath/bn_s_mp_prime_is_divisible.c ../libtommath/bn_s_mp_rand_jenkins.c ../libtommath/bn_s_mp_reverse.c ../libtommath/bn_s_mp_sqr.c ../libtommath/bn_s_mp_sqr_fast.c ../libtommath/bn_s_mp_sub.c ../libtommath/bn_s_mp_toom_mul.c ../libtommath/bn_s_mp_toom_sqr.c '
diff --git a/libc3/update_sources b/libc3/update_sources
index 10902dd..5d6c467 100755
--- a/libc3/update_sources
+++ b/libc3/update_sources
@@ -5,6 +5,11 @@
 echo "# sources.mk generated by update_sources" > ${SOURCES_MK}
 echo "# sources.sh generated by update_sources" > ${SOURCES_SH}
 
+HEADERS="$(ls *.h)"
+HEADERS="$(echo "$HEADERS" | tr '\n' ' ')"
+echo "HEADERS = $HEADERS" >> ${SOURCES_MK}
+echo "HEADERS='$HEADERS'" >> ${SOURCES_SH}
+
 SOURCES="$(ls *.c)"
 SOURCES="$(echo "$SOURCES" | tr '\n' ' ')"
 echo "SOURCES = $SOURCES" >> ${SOURCES_MK}