From 473bcd6572f88c6f9514f72bda49eba60b38ecb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Sat, 8 Oct 2016 10:08:47 +0200 Subject: [PATCH] buildsystem: move ECL_IEEE_FP define to config.h --- src/c/Makefile.in | 5 ++--- src/h/config-internal.h.in | 2 -- src/h/config.h.in | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/c/Makefile.in b/src/c/Makefile.in index 69c3a683e..a0b6118c5 100644 --- a/src/c/Makefile.in +++ b/src/c/Makefile.in @@ -84,13 +84,12 @@ all: $(DPP) ../libeclmin.a ../cinit.o .d.o: $(DPP) if test -f ../CROSS-DPP ; then ../CROSS-DPP $< $@.c ; else $(DPP) $< $@.c ; fi $(CC) -DECLDIR="\"@ecldir@\"" $(CFLAGS) -o $@ $@.c -.c.o: +.c.o: $(HFILES) $(CC) -DECLDIR="\"@ecldir@\"" $(CFLAGS) -o $@ $< .d.s: $(HFILES) if test -f ../CROSS-DPP ; then ../CROSS-DPP $< $@.c ; else $(DPP) $< $@.c ; fi $(CC) -DECLDIR="\"@ecldir@\"" $(CFLAGS) -S -o $@ $@.c -#.c.o: $(HFILES) -# $(CC) -DECLDIR="\"@ecldir@\"" $(CFLAGS) -o $@ $< + apply_x86.c: $(srcdir)/arch/apply_x86.d $(DPP) $(HFILES) if test -f ../CROSS-DPP ; then \ ../CROSS-DPP $(srcdir)/arch/apply_x86.d $@ ; \ diff --git a/src/h/config-internal.h.in b/src/h/config-internal.h.in index 7af8996e9..5073e5898 100644 --- a/src/h/config-internal.h.in +++ b/src/h/config-internal.h.in @@ -121,8 +121,6 @@ #undef ECL_AVOID_FPE_H /* do we want to have signed zeros */ #undef ECL_SIGNED_ZERO -/* do we want NaNs and Infs */ -#undef ECL_IEEE_FP /* has support for large files */ #undef HAVE_FSEEKO /* the tzset() function gets the current time zone */ diff --git a/src/h/config.h.in b/src/h/config.h.in index 63b98077a..2dfe872d9 100644 --- a/src/h/config.h.in +++ b/src/h/config.h.in @@ -216,6 +216,9 @@ typedef unsigned char ecl_base_char; #undef HAVE_DOUBLE_COMPLEX #undef HAVE_FLOAT_COMPLEX +/* do we want NaNs and Infs */ +#undef ECL_IEEE_FP + /* We can use small, two-words conses, without type information */ #undef ECL_SMALL_CONS