Put the AM_CPPFLAGS into CPPFLAGS32, CPPFLAGS64, CPPFLAGSARM32 and CPPFLAGSARM64 and then remove it from all variable which includes one of those CPPFLAGS*. --- mingw-w64-crt/Makefile.am | 39 ++++---- mingw-w64-crt/testcases/complex/Makefile.am | 100 ++++++++++---------- 2 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 705bc3c38306..afb8aa10ed73 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am @@ -23,9 +23,10 @@ AM_CPPFLAGS=$(sysincludes) AM_CFLAGS=-pipe -std=gnu99 -fno-builtin -D_CRTBLD -D_WIN32_WINNT=0x0f00 -D__MSVCRT_VERSION__=0x600 -D__USE_MINGW_ANSI_STDIO=0 @IMAGEBASE_CFLAGS@ @CFGUARD_CFLAGS@ @ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@ AM_CXXFLAGS=@ADD_C_CXX_WARNING_FLAGS@ @ADD_CXX_ONLY_WARNING_FLAGS@ AM_CCASFLAGS=@CFGUARD_CFLAGS@ -CPPFLAGSARM32=-mfpu=vfpv3 -CPPFLAGS32=-m32 -masm=att -CPPFLAGS64=-m64 -masm=att +CPPFLAGSARM32=$(AM_CPPFLAGS) -mfpu=vfpv3 +CPPFLAGSARM64=$(AM_CPPFLAGS) +CPPFLAGS32=$(AM_CPPFLAGS) -m32 -masm=att +CPPFLAGS64=$(AM_CPPFLAGS) -m64 -masm=att AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ DLLTOOLFLAGSARM32=-m arm if ARM64EC @@ -1332,7 +1333,7 @@ test.c lib32_LIBRARIES = lib32/libkernel32.a lib32_libkernel32_a_SOURCES = $(src_intrincs) $(src_intrincs32) lib32_libkernel32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS) -lib32_libkernel32_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS) +lib32_libkernel32_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) lib32_DATA = if !W32API @@ -1503,15 +1504,15 @@ lib32_liblargeint_a_SOURCES = $(src_liblargeint) lib32_liblargeint_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes) lib32_LIBRARIES += lib32/libmingw32.a -lib32_libmingw32_a_CPPFLAGS=$(CPPFLAGS32) -D_SYSCRT=1 $(extra_include) $(AM_CPPFLAGS) +lib32_libmingw32_a_CPPFLAGS=$(CPPFLAGS32) -D_SYSCRT=1 $(extra_include) lib32_libmingw32_a_SOURCES = $(src_libmingw32) crt/CRT_fp10.c lib32_LIBRARIES += lib32/libmingwex.a -lib32_libmingwex_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS) +lib32_libmingwex_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) lib32_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwex32) $(src_dfp_math) lib32_LIBRARIES += lib32/libmoldname.a -lib32_libmoldname_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS) +lib32_libmoldname_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) lib32_libmoldname_a_SOURCES = $(src_libm) lib32_LIBRARIES += lib32/libmingwthrd.a @@ -1758,7 +1759,7 @@ lib64/%.o: crt/%.c lib64_LIBRARIES = lib64/libkernel32.a lib64_libkernel32_a_SOURCES = $(src_intrincs) $(src_intrincs64) lib-common/kernel32.def.in -lib64_libkernel32_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS) +lib64_libkernel32_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) lib64_libkernel32_a_AR = $(DTDEF64) lib64/kernel32.def && $(AR) $(ARFLAGS) EXTRA_lib64_libkernel32_a_DEPENDENCIES=lib64/kernel32.def @@ -1926,15 +1927,15 @@ lib64_liblargeint_a_SOURCES = $(src_liblargeint) lib64_liblargeint_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes) lib64_LIBRARIES += lib64/libmingw32.a -lib64_libmingw32_a_CPPFLAGS=$(CPPFLAGS64) -D_SYSCRT=1 $(extra_include) $(AM_CPPFLAGS) +lib64_libmingw32_a_CPPFLAGS=$(CPPFLAGS64) -D_SYSCRT=1 $(extra_include) lib64_libmingw32_a_SOURCES = $(src_libmingw32) crt/CRT_fp10.c lib64_LIBRARIES += lib64/libmingwex.a -lib64_libmingwex_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS) +lib64_libmingwex_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) lib64_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwex64) $(src_dfp_math) lib64_LIBRARIES += lib64/libmoldname.a -lib64_libmoldname_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS) +lib64_libmoldname_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) lib64_libmoldname_a_SOURCES = $(src_libm) lib64_LIBRARIES += lib64/libmingwthrd.a @@ -2136,7 +2137,7 @@ test.c libarm32_LIBRARIES = libarm32/libkernel32.a libarm32_libkernel32_a_SOURCES = $(src_intrincs) $(src_intrincsarm32) lib-common/kernel32.def.in libarm32_libkernel32_a_AR = $(DTDEFARM32) libarm32/kernel32.def && $(AR) $(ARFLAGS) -libarm32_libkernel32_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) $(AM_CPPFLAGS) +libarm32_libkernel32_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) EXTRA_libarm32_libkernel32_a_DEPENDENCIES=libarm32/kernel32.def libarm32_DATA = @@ -2299,15 +2300,15 @@ libarm32_liblargeint_a_SOURCES = $(src_liblargeint) libarm32_liblargeint_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes) libarm32_LIBRARIES += libarm32/libmingw32.a -libarm32_libmingw32_a_CPPFLAGS=$(CPPFLAGSARM32) -D_SYSCRT=1 $(extra_include) $(AM_CPPFLAGS) +libarm32_libmingw32_a_CPPFLAGS=$(CPPFLAGSARM32) -D_SYSCRT=1 $(extra_include) libarm32_libmingw32_a_SOURCES = $(src_libmingw32) libarm32_LIBRARIES += libarm32/libmingwex.a -libarm32_libmingwex_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) $(AM_CPPFLAGS) +libarm32_libmingwex_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) libarm32_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwexarm32) $(src_dfp_math) libarm32_LIBRARIES += libarm32/libmoldname.a -libarm32_libmoldname_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) $(AM_CPPFLAGS) +libarm32_libmoldname_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) libarm32_libmoldname_a_SOURCES = $(src_libm) libarm32_LIBRARIES += libarm32/libmingwthrd.a @@ -2461,7 +2462,7 @@ test.c libarm64_LIBRARIES = libarm64/libkernel32.a libarm64_libkernel32_a_SOURCES = $(src_intrincs) $(src_intrincsarm64) lib-common/kernel32.def.in libarm64_libkernel32_a_AR = $(DTDEFARM64) libarm64/kernel32.def && $(AR) $(ARFLAGS) -libarm64_libkernel32_a_CPPFLAGS=$(CPPFLAGSARM64) $(extra_include) $(AM_CPPFLAGS) +libarm64_libkernel32_a_CPPFLAGS=$(CPPFLAGSARM64) $(extra_include) EXTRA_libarm64_libkernel32_a_DEPENDENCIES=libarm64/kernel32.def libarm64_DATA = @@ -2624,16 +2625,16 @@ libarm64_liblargeint_a_SOURCES = $(src_liblargeint) libarm64_liblargeint_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes) libarm64_LIBRARIES += libarm64/libmingw32.a -libarm64_libmingw32_a_CPPFLAGS=$(CPPFLAGSARM64) -D_SYSCRT=1 $(extra_include) $(AM_CPPFLAGS) +libarm64_libmingw32_a_CPPFLAGS=$(CPPFLAGSARM64) -D_SYSCRT=1 $(extra_include) libarm64_libmingw32_a_SOURCES = $(src_libmingw32) libarm64_LIBRARIES += libarm64/libmingwex.a -libarm64_libmingwex_a_CPPFLAGS=$(CPPFLAGSARM64) $(extra_include) $(AM_CPPFLAGS) +libarm64_libmingwex_a_CPPFLAGS=$(CPPFLAGSARM64) $(extra_include) libarm64_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwexarm64) $(src_dfp_math) libarm64_libmingwex_a_LIBADD=$(src_libmingwexarm64_x64) libarm64_LIBRARIES += libarm64/libmoldname.a -libarm64_libmoldname_a_CPPFLAGS=$(CPPFLAGSARM64) $(extra_include) $(AM_CPPFLAGS) +libarm64_libmoldname_a_CPPFLAGS=$(CPPFLAGSARM64) $(extra_include) libarm64_libmoldname_a_SOURCES = $(src_libm) libarm64_LIBRARIES += libarm64/libmingwthrd.a diff --git a/mingw-w64-crt/testcases/complex/Makefile.am b/mingw-w64-crt/testcases/complex/Makefile.am index 8a3e36ee2fb1..013758e22f9f 100644 --- a/mingw-w64-crt/testcases/complex/Makefile.am +++ b/mingw-w64-crt/testcases/complex/Makefile.am @@ -94,11 +94,11 @@ TESTS += $(newcomplex_tests32) # Remove these when completed. XFAIL_TESTS += -tests32_libnewcomplextestsf_a_CPPFLAGS= $(CPPFLAGS32) -D_NEW_COMPLEX_FLOAT=1 $(complex_inc) $(AM_CPPFLAGS) +tests32_libnewcomplextestsf_a_CPPFLAGS= $(CPPFLAGS32) -D_NEW_COMPLEX_FLOAT=1 $(complex_inc) tests32_libnewcomplextestsf_a_SOURCES = $(check_complex_lib_sources) -tests32_libnewcomplextests_a_CPPFLAGS= $(CPPFLAGS32) -D_NEW_COMPLEX_DOUBLE=1 $(complex_inc) $(AM_CPPFLAGS) +tests32_libnewcomplextests_a_CPPFLAGS= $(CPPFLAGS32) -D_NEW_COMPLEX_DOUBLE=1 $(complex_inc) tests32_libnewcomplextests_a_SOURCES = $(check_complex_lib_sources) -tests32_libnewcomplextestsld_a_CPPFLAGS= $(CPPFLAGS32) -D_NEW_COMPLEX_LDOUBLE=1 $(complex_inc) $(AM_CPPFLAGS) +tests32_libnewcomplextestsld_a_CPPFLAGS= $(CPPFLAGS32) -D_NEW_COMPLEX_LDOUBLE=1 $(complex_inc) tests32_libnewcomplextestsld_a_SOURCES = $(check_complex_lib_sources) # Complex library actual test programs. @@ -130,112 +130,112 @@ newcomplex_tests32 = \ # the main test program calls all three abi versions of the function being # tested. tests32_cabs_SOURCES = complex/main.c -tests32_cabs_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cabs $(complex_inc) $(AM_CPPFLAGS) +tests32_cabs_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cabs $(complex_inc) tests32_cabs_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cabs_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_cacos_SOURCES = complex/main.c -tests32_cacos_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cacos $(complex_inc) $(AM_CPPFLAGS) +tests32_cacos_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cacos $(complex_inc) tests32_cacos_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cacos_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_cacosh_SOURCES = complex/main.c -tests32_cacosh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cacosh $(complex_inc) $(AM_CPPFLAGS) +tests32_cacosh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cacosh $(complex_inc) tests32_cacosh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cacosh_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_carg_SOURCES = complex/main.c -tests32_carg_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=carg $(complex_inc) $(AM_CPPFLAGS) +tests32_carg_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=carg $(complex_inc) tests32_carg_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_carg_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_casin_SOURCES = complex/main.c -tests32_casin_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=casin $(complex_inc) $(AM_CPPFLAGS) +tests32_casin_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=casin $(complex_inc) tests32_casin_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_casin_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_casinh_SOURCES = complex/main.c -tests32_casinh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=casinh $(complex_inc) $(AM_CPPFLAGS) +tests32_casinh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=casinh $(complex_inc) tests32_casinh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_casinh_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_catan_SOURCES = complex/main.c -tests32_catan_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=catan $(complex_inc) $(AM_CPPFLAGS) +tests32_catan_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=catan $(complex_inc) tests32_catan_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_catan_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_catanh_SOURCES = complex/main.c -tests32_catanh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=catanh $(complex_inc) $(AM_CPPFLAGS) +tests32_catanh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=catanh $(complex_inc) tests32_catanh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_catanh_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_ccos_SOURCES = complex/main.c -tests32_ccos_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ccos $(complex_inc) $(AM_CPPFLAGS) +tests32_ccos_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ccos $(complex_inc) tests32_ccos_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_ccos_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_ccosh_SOURCES = complex/main.c -tests32_ccosh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ccosh $(complex_inc) $(AM_CPPFLAGS) +tests32_ccosh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ccosh $(complex_inc) tests32_ccosh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_ccosh_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_cexp_SOURCES = complex/main.c -tests32_cexp_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cexp $(complex_inc) $(AM_CPPFLAGS) +tests32_cexp_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cexp $(complex_inc) tests32_cexp_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cexp_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_cimag_SOURCES = complex/main.c -tests32_cimag_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cimag $(complex_inc) $(AM_CPPFLAGS) +tests32_cimag_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cimag $(complex_inc) tests32_cimag_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cimag_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_clog_SOURCES = complex/main.c -tests32_clog_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=clog $(complex_inc) $(AM_CPPFLAGS) +tests32_clog_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=clog $(complex_inc) tests32_clog_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_clog_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_conj_SOURCES = complex/main.c -tests32_conj_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=conj $(complex_inc) $(AM_CPPFLAGS) +tests32_conj_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=conj $(complex_inc) tests32_conj_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_conj_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_cpow_SOURCES = complex/main.c -tests32_cpow_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cpow $(complex_inc) $(AM_CPPFLAGS) +tests32_cpow_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cpow $(complex_inc) tests32_cpow_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cpow_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_cproj_SOURCES = complex/main.c -tests32_cproj_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cproj $(complex_inc) $(AM_CPPFLAGS) +tests32_cproj_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=cproj $(complex_inc) tests32_cproj_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_cproj_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_creal_SOURCES = complex/main.c -tests32_creal_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=creal $(complex_inc) $(AM_CPPFLAGS) +tests32_creal_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=creal $(complex_inc) tests32_creal_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_creal_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_csin_SOURCES = complex/main.c -tests32_csin_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csin $(complex_inc) $(AM_CPPFLAGS) +tests32_csin_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csin $(complex_inc) tests32_csin_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_csin_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_csinh_SOURCES = complex/main.c -tests32_csinh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csinh $(complex_inc) $(AM_CPPFLAGS) +tests32_csinh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csinh $(complex_inc) tests32_csinh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_csinh_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_csqrt_SOURCES = complex/main.c -tests32_csqrt_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csqrt $(complex_inc) $(AM_CPPFLAGS) +tests32_csqrt_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=csqrt $(complex_inc) tests32_csqrt_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_csqrt_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_ctan_SOURCES = complex/main.c -tests32_ctan_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ctan $(complex_inc) $(AM_CPPFLAGS) +tests32_ctan_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ctan $(complex_inc) tests32_ctan_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_ctan_LDADD = $(newcomplex_test_lib32) $(LDADD) tests32_ctanh_SOURCES = complex/main.c -tests32_ctanh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ctanh $(complex_inc) $(AM_CPPFLAGS) +tests32_ctanh_CPPFLAGS = $(CPPFLAGS32) -DTESTFUNC=ctanh $(complex_inc) tests32_ctanh_LDFLAGS = $(LDFLAGS32) $(AM_LDFLAGS) tests32_ctanh_LDADD = $(newcomplex_test_lib32) $(LDADD) @@ -260,11 +260,11 @@ check_PROGRAMS += $(newcomplex_tests64) TESTS += $(newcomplex_tests64) XFAIL_TESTS += -tests64_libnewcomplextestsf_a_CPPFLAGS= $(CPPFLAGS64) -D_NEW_COMPLEX_FLOAT=1 $(complex_inc) $(AM_CPPFLAGS) +tests64_libnewcomplextestsf_a_CPPFLAGS= $(CPPFLAGS64) -D_NEW_COMPLEX_FLOAT=1 $(complex_inc) tests64_libnewcomplextestsf_a_SOURCES = $(check_complex_lib_sources) -tests64_libnewcomplextests_a_CPPFLAGS= $(CPPFLAGS64) -D_NEW_COMPLEX_DOUBLE=1 $(complex_inc) $(AM_CPPFLAGS) +tests64_libnewcomplextests_a_CPPFLAGS= $(CPPFLAGS64) -D_NEW_COMPLEX_DOUBLE=1 $(complex_inc) tests64_libnewcomplextests_a_SOURCES = $(check_complex_lib_sources) -tests64_libnewcomplextestsld_a_CPPFLAGS= $(CPPFLAGS64) -D_NEW_COMPLEX_LDOUBLE=1 $(complex_inc) $(AM_CPPFLAGS) +tests64_libnewcomplextestsld_a_CPPFLAGS= $(CPPFLAGS64) -D_NEW_COMPLEX_LDOUBLE=1 $(complex_inc) tests64_libnewcomplextestsld_a_SOURCES = $(check_complex_lib_sources) # Complex library actual test programs. @@ -296,112 +296,112 @@ newcomplex_tests64 = \ # the main test program calls all three abi versions of the function being # tested. tests64_cabs_SOURCES = complex/main.c -tests64_cabs_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cabs $(complex_inc) $(AM_CPPFLAGS) +tests64_cabs_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cabs $(complex_inc) tests64_cabs_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cabs_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_cacos_SOURCES = complex/main.c -tests64_cacos_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cacos $(complex_inc) $(AM_CPPFLAGS) +tests64_cacos_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cacos $(complex_inc) tests64_cacos_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cacos_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_cacosh_SOURCES = complex/main.c -tests64_cacosh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cacosh $(complex_inc) $(AM_CPPFLAGS) +tests64_cacosh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cacosh $(complex_inc) tests64_cacosh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cacosh_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_carg_SOURCES = complex/main.c -tests64_carg_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=carg $(complex_inc) $(AM_CPPFLAGS) +tests64_carg_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=carg $(complex_inc) tests64_carg_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_carg_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_casin_SOURCES = complex/main.c -tests64_casin_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=casin $(complex_inc) $(AM_CPPFLAGS) +tests64_casin_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=casin $(complex_inc) tests64_casin_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_casin_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_casinh_SOURCES = complex/main.c -tests64_casinh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=casinh $(complex_inc) $(AM_CPPFLAGS) +tests64_casinh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=casinh $(complex_inc) tests64_casinh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_casinh_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_catan_SOURCES = complex/main.c -tests64_catan_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=catan $(complex_inc) $(AM_CPPFLAGS) +tests64_catan_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=catan $(complex_inc) tests64_catan_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_catan_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_catanh_SOURCES = complex/main.c -tests64_catanh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=catanh $(complex_inc) $(AM_CPPFLAGS) +tests64_catanh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=catanh $(complex_inc) tests64_catanh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_catanh_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_ccos_SOURCES = complex/main.c -tests64_ccos_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ccos $(complex_inc) $(AM_CPPFLAGS) +tests64_ccos_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ccos $(complex_inc) tests64_ccos_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_ccos_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_ccosh_SOURCES = complex/main.c -tests64_ccosh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ccosh $(complex_inc) $(AM_CPPFLAGS) +tests64_ccosh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ccosh $(complex_inc) tests64_ccosh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_ccosh_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_cexp_SOURCES = complex/main.c -tests64_cexp_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cexp $(complex_inc) $(AM_CPPFLAGS) +tests64_cexp_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cexp $(complex_inc) tests64_cexp_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cexp_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_cimag_SOURCES = complex/main.c -tests64_cimag_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cimag $(complex_inc) $(AM_CPPFLAGS) +tests64_cimag_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cimag $(complex_inc) tests64_cimag_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cimag_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_clog_SOURCES = complex/main.c -tests64_clog_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=clog $(complex_inc) $(AM_CPPFLAGS) +tests64_clog_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=clog $(complex_inc) tests64_clog_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_clog_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_conj_SOURCES = complex/main.c -tests64_conj_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=conj $(complex_inc) $(AM_CPPFLAGS) +tests64_conj_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=conj $(complex_inc) tests64_conj_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_conj_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_cpow_SOURCES = complex/main.c -tests64_cpow_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cpow $(complex_inc) $(AM_CPPFLAGS) +tests64_cpow_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cpow $(complex_inc) tests64_cpow_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cpow_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_cproj_SOURCES = complex/main.c -tests64_cproj_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cproj $(complex_inc) $(AM_CPPFLAGS) +tests64_cproj_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=cproj $(complex_inc) tests64_cproj_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_cproj_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_creal_SOURCES = complex/main.c -tests64_creal_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=creal $(complex_inc) $(AM_CPPFLAGS) +tests64_creal_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=creal $(complex_inc) tests64_creal_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_creal_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_csin_SOURCES = complex/main.c -tests64_csin_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csin $(complex_inc) $(AM_CPPFLAGS) +tests64_csin_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csin $(complex_inc) tests64_csin_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_csin_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_csinh_SOURCES = complex/main.c -tests64_csinh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csinh $(complex_inc) $(AM_CPPFLAGS) +tests64_csinh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csinh $(complex_inc) tests64_csinh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_csinh_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_csqrt_SOURCES = complex/main.c -tests64_csqrt_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csqrt $(complex_inc) $(AM_CPPFLAGS) +tests64_csqrt_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=csqrt $(complex_inc) tests64_csqrt_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_csqrt_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_ctan_SOURCES = complex/main.c -tests64_ctan_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ctan $(complex_inc) $(AM_CPPFLAGS) +tests64_ctan_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ctan $(complex_inc) tests64_ctan_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_ctan_LDADD = $(newcomplex_test_lib64) $(LDADD) tests64_ctanh_SOURCES = complex/main.c -tests64_ctanh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ctanh $(complex_inc) $(AM_CPPFLAGS) +tests64_ctanh_CPPFLAGS = $(CPPFLAGS64) -DTESTFUNC=ctanh $(complex_inc) tests64_ctanh_LDFLAGS = $(LDFLAGS64) $(AM_LDFLAGS) tests64_ctanh_LDADD = $(newcomplex_test_lib64) $(LDADD) -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
