diff --git a/makefile b/makefile index 4a91506d..85a6a9a7 100644 --- a/makefile +++ b/makefile @@ -135,11 +135,11 @@ ABSDYNLIB = $(FINUFFT)$(DYNLIB) # spreader is subset of the library with self-contained testing, hence own objs: # double-prec spreader object files that also need single precision... -SOBJS = src/spreadinterp.o src/utils.o +SOBJS = # their single-prec versions SOBJSF = $(SOBJS:%.o=%_32.o) # precision-dependent spreader object files (compiled & linked only once)... -SOBJS_PI = src/utils_precindep.o +SOBJS_PI = src/utils_precindep.o src/spreadinterp.o # spreader dual-precision objs SOBJSD = $(SOBJS) $(SOBJSF) $(SOBJS_PI) @@ -209,7 +209,6 @@ HEADERS = $(wildcard include/*.h include/finufft/*.h) $(DUCC_HEADERS) include/finufft/fft.h: $(DUCC_SETUP) SHEAD = $(wildcard src/*.h) $(XSIMD_DIR)/include/xsimd/xsimd.hpp src/spreadinterp.o: $(SHEAD) -src/spreadinterp_32.o: $(SHEAD) # lib ----------------------------------------------------------------------- @@ -277,10 +276,10 @@ test/%: test/%.cpp $(DYNLIB) test/%f: test/%.cpp $(DYNLIB) $(CXX) $(CXXFLAGS) ${LDFLAGS} -DSINGLE $< $(ABSDYNLIB) $(LIBSFFT) -o $@ # low-level tests that are cleaner if depend on only specific objects... -test/testutils: test/testutils.cpp src/utils.o src/utils_precindep.o - $(CXX) $(CXXFLAGS) ${LDFLAGS} test/testutils.cpp src/utils.o src/utils_precindep.o $(LIBS) -o test/testutils -test/testutilsf: test/testutils.cpp src/utils_32.o src/utils_precindep.o - $(CXX) $(CXXFLAGS) ${LDFLAGS} -DSINGLE test/testutils.cpp src/utils_32.o src/utils_precindep.o $(LIBS) -o test/testutilsf +test/testutils: test/testutils.cpp src/utils_precindep.o + $(CXX) $(CXXFLAGS) ${LDFLAGS} test/testutils.cpp src/utils_precindep.o $(LIBS) -o test/testutils +test/testutilsf: test/testutils.cpp src/utils_precindep.o + $(CXX) $(CXXFLAGS) ${LDFLAGS} -DSINGLE test/testutils.cpp src/utils_precindep.o $(LIBS) -o test/testutilsf # make sure all double-prec test executables ready for testing TESTS := $(basename $(wildcard test/*.cpp))