diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index 6987c3f06e0e585b6db935775b3332b92ec793fe..5efb13594f5f0bea5dba30a590d1b3e5d9235391 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -1880,9 +1880,9 @@ endif (${T_TRACER}) #This rule and the following deal with it. add_custom_command ( OUTPUT ${OPENAIR_DIR}/common/utils/T/T_IDs.h - COMMAND make clean - COMMAND make - COMMAND make check_vcd + COMMAND $(MAKE) clean + COMMAND $(MAKE) + COMMAND $(MAKE) check_vcd WORKING_DIRECTORY ${OPENAIR_DIR}/common/utils/T DEPENDS ${OPENAIR_DIR}/common/utils/T/T_messages.txt ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c @@ -2235,7 +2235,7 @@ function(make_driver name dir) endforeach() CONFIGURE_FILE(${OPENAIR_CMAKE}/tools/Kbuild.cmake ${OPENAIR_BIN_DIR}/${name}/Kbuild) add_custom_command(OUTPUT ${name}.ko - COMMAND make -C ${module_build_path} M=${OPENAIR_BIN_DIR}/${name} + COMMAND $(MAKE) -C ${module_build_path} M=${OPENAIR_BIN_DIR}/${name} WORKING_DIRECTORY ${OPENAIR_BIN_DIR}/${name} COMMENT "building ${module}.ko" VERBATIM diff --git a/common/utils/T/Makefile b/common/utils/T/Makefile index a722c2cbf74439e281164c9081804a4fbd512067..1f845ce4f8aa6d1c69c4a8c93b363a81ec05a1f6 100644 --- a/common/utils/T/Makefile +++ b/common/utils/T/Makefile @@ -27,4 +27,4 @@ check_vcd: clean: rm -f *.o $(GENIDS) core T_IDs.h T_messages.txt.h _check_vcd - cd tracer && make clean + cd tracer && $(MAKE) clean diff --git a/common/utils/T/tracer/Makefile b/common/utils/T/tracer/Makefile index 94902b094ae4b6585cf71a4c7262754233221f70..3da4aa13a17528cc1396f5eedc2e40eee91c2cb1 100644 --- a/common/utils/T/tracer/Makefile +++ b/common/utils/T/tracer/Makefile @@ -63,16 +63,16 @@ multi: multi.o utils.o database.o config.o .PHONY: all gui/gui.a view/view.a logger/logger.a filter/filter.a gui/gui.a: - cd gui && make + cd gui && $(MAKE) view/view.a: - cd view && make + cd view && $(MAKE) logger/logger.a: - cd logger && make + cd logger && $(MAKE) filter/filter.a: - cd filter && make + cd filter && $(MAKE) %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< @@ -81,8 +81,8 @@ clean: rm -f *.o core tracer_remote textlog enb ue vcd record replay rm -f extract_config macpdu2wireshark extract_input_subframe rm -f extract_output_subframe to_vcd extract multi - cd gui && make clean - cd view && make clean - cd logger && make clean - cd filter && make clean - cd hacks && make clean + cd gui && $(MAKE) clean + cd view && $(MAKE) clean + cd logger && $(MAKE) clean + cd filter && $(MAKE) clean + cd hacks && $(MAKE) clean