call $(MAKE) instead of make

This commit is contained in:
Felix J. Ogris 2025-02-01 18:19:23 +01:00
parent f5f2a3b2f2
commit 1c3c9a5c94
2 changed files with 23 additions and 23 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

@ -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) ))