From edbabee1bc5d766ca8b0c7c1805f6f603ab7aea2 Mon Sep 17 00:00:00 2001 From: scribam Date: Fri, 20 Dec 2024 13:16:34 +0100 Subject: [PATCH] makefile: remove "includes" include directory --- Makefile | 8 ++++---- Makefile.watcom | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7b293d2e..73448b1b 100644 --- a/Makefile +++ b/Makefile @@ -460,7 +460,7 @@ units: mod core lib $(UNITS_OBJ) $(MOD_OBJ) @echo -e "\n\t[UNIT TESTS SUITE]" @mkdir -p $(PREFIX)/test @echo -e "\t[CC] units.o" - @$(CC) -g -c -o $(PREFIX)/test/units.o test/units.c $(UNIT_CFLAGS) -I stack -I modules -I includes -I test/unit -DUNIT_TEST + @$(CC) -g -c -o $(PREFIX)/test/units.o test/units.c $(UNIT_CFLAGS) -I stack -I modules -I test/unit -DUNIT_TEST @echo -e "\t[LD] $(PREFIX)/test/units" @$(CC) -o $(PREFIX)/test/units $(UNIT_CFLAGS) $(PREFIX)/test/units.o $(UNIT_LDFLAGS) \ $(UNITS_OBJ) $(PREFIX)/modules/pico_aodv.o \ @@ -496,8 +496,8 @@ devunits: mod core lib @echo -e "\n\t[UNIT TESTS SUITE: device drivers]" @mkdir -p $(PREFIX)/test/unit/device/ @echo -e "\t[CC] picotcp_mock.o" - @$(CC) -c -o $(PREFIX)/test/unit/device/picotcp_mock.o $(CFLAGS) -I stack -I modules -I includes -I test/unit test/unit/device/picotcp_mock.c - @$(CC) -c -o $(PREFIX)/test/unit/device/unit_dev_vde.o $(CFLAGS) -I stack -I modules -I includes -I test/unit test/unit/device/unit_dev_vde.c + @$(CC) -c -o $(PREFIX)/test/unit/device/picotcp_mock.o $(CFLAGS) -I stack -I modules -I test/unit test/unit/device/picotcp_mock.c + @$(CC) -c -o $(PREFIX)/test/unit/device/unit_dev_vde.o $(CFLAGS) -I stack -I modules -I test/unit test/unit/device/unit_dev_vde.c @echo -e "\t[LD] $(PREFIX)/test/devunits" @$(CC) -o $(PREFIX)/test/devunits $(CFLAGS) -I stack $(PREFIX)/test/unit/device/*.o -lcheck -lm -pthread -lrt @@ -509,7 +509,7 @@ units_mm: mod core lib @echo -e "\n\t[UNIT TESTS SUITE]" @mkdir -p $(PREFIX)/test @echo -e "\t[CC] units_mm.o" - @$(CC) -c -o $(PREFIX)/test/units_mm.o test/unit/unit_mem_manager.c $(CFLAGS) -I stack -I modules -I includes -I test/unit + @$(CC) -c -o $(PREFIX)/test/units_mm.o test/unit/unit_mem_manager.c $(CFLAGS) -I stack -I modules -I test/unit @echo -e "\t[LD] $(PREFIX)/test/units" @$(CC) -o $(PREFIX)/test/units_mm $(CFLAGS) $(PREFIX)/test/units_mm.o -lcheck -lm -pthread -lrt diff --git a/Makefile.watcom b/Makefile.watcom index cbe04d7d..0a0d6f81 100644 --- a/Makefile.watcom +++ b/Makefile.watcom @@ -326,7 +326,7 @@ units: mod core lib $(UNITS_OBJ) $(MOD_OBJ) @echo -e "\n\t[UNIT TESTS SUITE]" @mkdir -p $(PREFIX)/test @echo -e "\t[CC] units.o" - @$(CC) -c -o $(PREFIX)/test/units.o test/units.c $(CFLAGS) -I stack -I modules -I includes -I test/unit -dUNIT_TEST + @$(CC) -c -o $(PREFIX)/test/units.o test/units.c $(CFLAGS) -I stack -I modules -I test/unit -dUNIT_TEST @echo -e "\t[LD] $(PREFIX)/test/units" @$(CC) -o $(PREFIX)/test/units $(CFLAGS) $(PREFIX)/test/units.o -lcheck -lm -pthread -lrt \ $(UNITS_OBJ) $(PREFIX)/modules/pico_aodv.o \ @@ -354,8 +354,8 @@ devunits: mod core lib @echo -e "\n\t[UNIT TESTS SUITE: device drivers]" @mkdir -p $(PREFIX)/test/unit/device/ @echo -e "\t[CC] picotcp_mock.o" - @$(CC) -c -o $(PREFIX)/test/unit/device/picotcp_mock.o $(CFLAGS) -I stack -I modules -I includes -I test/unit test/unit/device/picotcp_mock.c - @$(CC) -c -o $(PREFIX)/test/unit/device/unit_dev_vde.o $(CFLAGS) -I stack -I modules -I includes -I test/unit test/unit/device/unit_dev_vde.c + @$(CC) -c -o $(PREFIX)/test/unit/device/picotcp_mock.o $(CFLAGS) -I stack -I modules -I test/unit test/unit/device/picotcp_mock.c + @$(CC) -c -o $(PREFIX)/test/unit/device/unit_dev_vde.o $(CFLAGS) -I stack -I modules -I test/unit test/unit/device/unit_dev_vde.c @echo -e "\t[LD] $(PREFIX)/test/devunits" @$(CC) -o $(PREFIX)/test/devunits $(CFLAGS) -I stack $(PREFIX)/test/unit/device/*.o -lcheck -lm -pthread -lrt @@ -363,7 +363,7 @@ units_mm: mod core lib @echo -e "\n\t[UNIT TESTS SUITE]" @mkdir -p $(PREFIX)/test @echo -e "\t[CC] units_mm.o" - @$(CC) -c -o $(PREFIX)/test/units_mm.o test/unit/unit_mem_manager.c $(CFLAGS) -I stack -I modules -I includes -I test/unit + @$(CC) -c -o $(PREFIX)/test/units_mm.o test/unit/unit_mem_manager.c $(CFLAGS) -I stack -I modules -I test/unit @echo -e "\t[LD] $(PREFIX)/test/units" @$(CC) -o $(PREFIX)/test/units_mm $(CFLAGS) $(PREFIX)/test/units_mm.o -lcheck -lm -pthread -lrt