Revision ab0b6b11
| core/core.mk | ||
|---|---|---|
| 30 | 30 |
AMIROOSCOREINC = $(AMIROOS_CORE_DIR)inc |
| 31 | 31 |
|
| 32 | 32 |
# C source files |
| 33 |
<<<<<<< Updated upstream |
|
| 34 | 33 |
AMIROOSCORECSRC = $(wildcard $(AMIROOS_CORE_DIR)src/*.c) |
| 35 |
======= |
|
| 36 | 34 |
AMIROOSCORECSRC = $(AMIROOS_CORE_DIR)src/aos_debug.c \ |
| 37 | 35 |
$(AMIROOS_CORE_DIR)src/aos_iostream.c \ |
| 38 | 36 |
$(AMIROOS_CORE_DIR)src/aos_rtcan.c \ |
| ... | ... | |
| 42 | 40 |
$(AMIROOS_CORE_DIR)src/aos_time.c \ |
| 43 | 41 |
$(AMIROOS_CORE_DIR)src/aos_timer.c \ |
| 44 | 42 |
$(AMIROOS_CORE_DIR)src/aos_unittest.c |
| 45 |
>>>>>>> Stashed changes |
|
| 46 | 43 |
|
| 47 | 44 |
# C++ source files |
| 48 | 45 |
AMIROOSCORECPPSRC = $(wildcard $(AMIROOS_CORE_DIR)src/*.c?*) |
| unittests/unittests.mk | ||
|---|---|---|
| 31 | 31 |
$(UNITTESTS_DIR)periphery-lld/inc |
| 32 | 32 |
|
| 33 | 33 |
# C sources |
| 34 |
<<<<<<< Updated upstream |
|
| 35 | 34 |
UNITTESTSCSRC = $(wildcard $(UNITTESTS_DIR)lld/src/*.c) \ |
| 36 | 35 |
$(wildcard $(UNITTESTS_DIR)periphery-lld/src/*.c) |
| 37 |
======= |
|
| 38 | 36 |
UNITTESTSCSRC = $(UNITTESTS_DIR)lld/src/ut_lld_adc.c \ |
| 39 | 37 |
$(UNITTESTS_DIR)lld/src/ut_lld_rtcan.c \ |
| 40 | 38 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_a3906.c \ |
| ... | ... | |
| 56 | 54 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_tps62113.c \ |
| 57 | 55 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_tps62113_ina219.c \ |
| 58 | 56 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_vcnl4020.c \ |
| 59 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_dw1000.c |
|
| 60 |
>>>>>>> Stashed changes |
|
| 61 |
|
|
| 57 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_dw1000.c |
|
Also available in: Unified diff