Compare commits

...

6 Commits

Author SHA1 Message Date
mborgerding
febd4caeed
Merge pull request #99 from lanurmi/newline
Add newline to end of kiss_fft_log.h
2025-02-10 08:42:49 -05:00
Lauri Nurmi
26992ad1e4 Add newline to end of kiss_fft_log.h
Some C(++) standard versions require source files to end with
a newline. Some compiler versions may issue a warning about
a missing newline.
2025-02-10 15:12:08 +02:00
mborgerding
00cc50ebaa
Merge pull request #98 from felixjogris/bsdmake
call $(MAKE) instead of make
2025-02-02 10:56:07 -05:00
Felix J. Ogris
1c3c9a5c94 call $(MAKE) instead of make 2025-02-01 18:19:23 +01:00
mborgerding
f5f2a3b2f2
Merge pull request #70 from razor7788/work
fixed test/Makefile line 137 missing ')'
2024-03-09 10:14:55 -05:00
razor_laptop
59c8cdfb08 fixed test/Makefile line 137 missing ')' 2021-10-18 00:43:05 +08:00
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!0 $(warning WARNING: No FFTW development files found! FFTW not available for comparison!)
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) ))