Compare commits

..

No commits in common. "master" and "131.1.0" have entirely different histories.

3 changed files with 25 additions and 25 deletions

View File

@ -204,7 +204,7 @@ else
$(AR) crus $(KISSFFTLIB_NAME) $^ $(AR) crus $(KISSFFTLIB_NAME) $^
endif endif
ifneq ($(KISSFFT_TOOLS), 0) ifneq ($(KISSFFT_TOOLS), 0)
$(MAKE) -C tools CFLAGADD="$(CFLAGADD)" all make -C tools CFLAGADD="$(CFLAGADD)" all
endif endif
# #
@ -240,7 +240,7 @@ ifneq ($(shell uname -s),Darwin)
kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)" kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)"
endif endif
ifneq ($(KISSFFT_TOOLS), 0) ifneq ($(KISSFFT_TOOLS), 0)
$(MAKE) -C tools install make -C tools install
endif endif
# #
@ -258,9 +258,9 @@ doc:
# #
testsingle: testsingle:
$(MAKE) clean make clean
$(MAKE) all make all
$(MAKE) -C test CFLAGADD="$(CFLAGADD)" test testcpp make -C test CFLAGADD="$(CFLAGADD)" test testcpp
# #
# Target: "make testall" # Target: "make testall"
@ -268,26 +268,26 @@ testsingle:
testall: testall:
# Shared libraries # Shared libraries
$(MAKE) KISSFFT_DATATYPE=double testsingle make KISSFFT_DATATYPE=double testsingle
$(MAKE) KISSFFT_DATATYPE=float testsingle make KISSFFT_DATATYPE=float testsingle
$(MAKE) KISSFFT_DATATYPE=int16_t testsingle make KISSFFT_DATATYPE=int16_t testsingle
# The simd and int32_t types may or may not work on your machine # The simd and int32_t types may or may not work on your machine
$(MAKE) KISSFFT_DATATYPE=int32_t testsingle make KISSFFT_DATATYPE=int32_t testsingle
$(MAKE) KISSFFT_DATATYPE=simd testsingle make KISSFFT_DATATYPE=simd testsingle
# Static libraries # Static libraries
$(MAKE) KISSFFT_DATATYPE=double KISSFFT_STATIC=1 testsingle make KISSFFT_DATATYPE=double KISSFFT_STATIC=1 testsingle
$(MAKE) KISSFFT_DATATYPE=float KISSFFT_STATIC=1 testsingle make KISSFFT_DATATYPE=float KISSFFT_STATIC=1 testsingle
$(MAKE) KISSFFT_DATATYPE=int16_t KISSFFT_STATIC=1 testsingle make KISSFFT_DATATYPE=int16_t KISSFFT_STATIC=1 testsingle
# The simd and int32_t types may or may not work on your machine # The simd and int32_t types may or may not work on your machine
$(MAKE) KISSFFT_DATATYPE=int32_t KISSFFT_STATIC=1 testsingle make KISSFFT_DATATYPE=int32_t KISSFFT_STATIC=1 testsingle
$(MAKE) KISSFFT_DATATYPE=simd KISSFFT_STATIC=1 testsingle make KISSFFT_DATATYPE=simd KISSFFT_STATIC=1 testsingle
# OpenMP libraries # OpenMP libraries
$(MAKE) KISSFFT_DATATYPE=double KISSFFT_OPENMP=1 testsingle make KISSFFT_DATATYPE=double KISSFFT_OPENMP=1 testsingle
$(MAKE) KISSFFT_DATATYPE=float KISSFFT_OPENMP=1 testsingle make KISSFFT_DATATYPE=float KISSFFT_OPENMP=1 testsingle
$(MAKE) KISSFFT_DATATYPE=int16_t KISSFFT_OPENMP=1 testsingle make KISSFFT_DATATYPE=int16_t KISSFFT_OPENMP=1 testsingle
# The simd and int32_t types may or may not work on your machine # The simd and int32_t types may or may not work on your machine
$(MAKE) KISSFFT_DATATYPE=int32_t KISSFFT_OPENMP=1 testsingle make KISSFFT_DATATYPE=int32_t KISSFFT_OPENMP=1 testsingle
$(MAKE) KISSFFT_DATATYPE=simd KISSFFT_OPENMP=1 testsingle make KISSFFT_DATATYPE=simd KISSFFT_OPENMP=1 testsingle
$(warning All tests passed!) $(warning All tests passed!)
# #
@ -304,8 +304,8 @@ tarball: clean
clean: clean:
rm -f *.o *.a *.so *.so.* rm -f *.o *.a *.so *.so.*
cd test && $(MAKE) clean cd test && make clean
cd tools && $(MAKE) clean cd tools && make clean
rm -f kiss_fft*.tar.gz *~ *.pyc kiss_fft*.zip rm -f kiss_fft*.tar.gz *~ *.pyc kiss_fft*.zip
# #

View File

@ -134,7 +134,7 @@ $(BENCHFFTW): benchfftw.c pstats.c
ifeq ($(LIBFFTW_MISSING), 0) ifeq ($(LIBFFTW_MISSING), 0)
$(CC) -o $@ $(CFLAGS) -DDATATYPE$(KISSFFT_DATATYPE) $^ $(FFTWLIB) -L$(ABS_FFTWLIBDIR) -L.. -l$(KISSFFTLIB_SHORTNAME) -lm $(CC) -o $@ $(CFLAGS) -DDATATYPE$(KISSFFT_DATATYPE) $^ $(FFTWLIB) -L$(ABS_FFTWLIBDIR) -L.. -l$(KISSFFTLIB_SHORTNAME) -lm
else else
$(warning WARNING: No FFTW development files found! FFTW not available for comparison!) $(warning WARNING: No FFTW development files found! FFTW not available for comparison!0
endif endif
# #
@ -167,7 +167,7 @@ testcpp: $(TESTCPP)
test: all test: all
ifeq "$(KISSFFT_DATATYPE)" "simd" ifeq "$(KISSFFT_DATATYPE)" "simd"
$(MAKE) testsse make testsse
endif endif
@LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):.." ./$(TESTKFC) @LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):.." ./$(TESTKFC)
$(warning ======1d & 2-d complex fft self test (type= $(KISSFFT_DATATYPE) )) $(warning ======1d & 2-d complex fft self test (type= $(KISSFFT_DATATYPE) ))