=== modified file 'uspace/Makefile'
|
|
|
255 | 255 | |
256 | 256 | all: $(BUILDS) $(BUILDS_TESTS) |
257 | 257 | |
258 | | $(BUILDS_TESTS): $(BUILDS) |
| 258 | $(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) |
259 | 259 | $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK) |
260 | 260 | |
261 | 261 | clean: $(CLEANS) |
=== modified file 'uspace/Makefile.common'
|
|
|
179 | 179 | endif |
180 | 180 | |
181 | 181 | ifeq ($(STATIC_BUILD),y) |
182 | | BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a |
| 182 | BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a |
183 | 183 | LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld |
184 | 184 | ifeq ($(MATH),y) |
185 | 185 | BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a |
… |
… |
|
314 | 314 | DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) |
315 | 315 | endif |
316 | 316 | |
| 317 | |
| 318 | ifneq ($(MAKECMDGOALS),clean) |
317 | 319 | -include $(DEPEND) |
| 320 | endif |
318 | 321 | |
319 | 322 | OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
320 | 323 | LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES))) |
… |
… |
|
354 | 357 | endif |
355 | 358 | |
356 | 359 | ifneq ($(LIBRARY),) |
357 | | %.a: $(OBJECTS) |
| 360 | $(LIBRARY).a: $(OBJECTS) |
358 | 361 | $(AR) rc $@ $(OBJECTS) |
359 | 362 | endif |
360 | 363 | |
361 | 364 | ifneq ($(SLIBRARY),) |
362 | | %.la: $(LOBJECTS) |
| 365 | $(SLIBRARY).la: $(LOBJECTS) |
363 | 366 | $(AR) rc $@ $(LOBJECTS) |
364 | 367 | endif |
365 | 368 | |
=== modified file 'uspace/app/barber/Makefile'
|
|
|
84 | 84 | |
85 | 85 | include $(USPACE_PREFIX)/Makefile.common |
86 | 86 | |
87 | | images.c images.h: $(IMAGES) |
88 | | $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^ |
| 87 | image%.c image%.h: $(IMAGES) |
| 88 | $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $(IMAGES) |
=== modified file 'uspace/lib/c/Makefile'
|
|
|
46 | 46 | SLIBRARY = libc.so.0.0 |
47 | 47 | LSONAME = libc.so0 |
48 | 48 | |
49 | | LIBS = $(LIBURCU_PREFIX)/liburcu.a |
50 | 49 | EXTRA_CFLAGS += -I$(LIBURCU_PREFIX) |
51 | 50 | |
52 | 51 | -include $(CONFIG_MAKEFILE) |
=== modified file 'uspace/lib/ext4/Makefile'
|
|
|
29 | 29 | USPACE_PREFIX = ../.. |
30 | 30 | LIBRARY = libext4 |
31 | 31 | EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) |
32 | | LIBS = $(LIBBLOCK_PREFIX)/libblock.a |
33 | 32 | |
34 | 33 | SOURCES = \ |
35 | 34 | libext4_balloc.c \ |
=== modified file 'uspace/lib/nic/Makefile'
|
|
|
29 | 29 | USPACE_PREFIX = ../.. |
30 | 30 | LIBRARY = libnic |
31 | 31 | EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include |
32 | | LIBS = $(LIBDRV_PREFIX)/libdrv.a |
33 | 32 | |
34 | 33 | SOURCES = \ |
35 | 34 | src/nic_driver.c \ |
=== modified file 'uspace/lib/pcut/Makefile'
|
|
|
5 | 5 | USPACE_PREFIX = ../.. |
6 | 6 | PCUT_TEST_PREFIX = test-libpcut- |
7 | 7 | |
8 | | EXTRA_OUTPUT = \ |
| 8 | SELF_TESTS = \ |
9 | 9 | $(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \ |
10 | 10 | $(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \ |
11 | 11 | $(PCUT_TEST_PREFIX)beforeafter$(PCUT_TEST_SUFFIX) \ |
… |
… |
|
24 | 24 | $(PCUT_TEST_PREFIX)timeout$(PCUT_TEST_SUFFIX) \ |
25 | 25 | $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX) |
26 | 26 | |
| 27 | EXTRA_CLEAN = $(SELF_TESTS) |
| 28 | |
27 | 29 | include helenos.mak |
28 | 30 | |
29 | 31 | include $(USPACE_PREFIX)/Makefile.common |
30 | 32 | |
31 | 33 | include helenos.test.mak |
32 | 34 | |
| 35 | all-test: $(SELF_TESTS) |
| 36 | |
33 | 37 | test-libpcut-%: $(OUTPUT) |
34 | 38 | $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS) |
35 | 39 | |
=== modified file 'uspace/lib/pcut/update-from-master.sh'
|
|
|
58 | 58 | USPACE_PREFIX = ../.. |
59 | 59 | PCUT_TEST_PREFIX = test-libpcut- |
60 | 60 | |
61 | | EXTRA_OUTPUT = \ |
| 61 | SELF_TESTS = \ |
62 | 62 | EOF_MAKEFILE_HEAD |
63 | 63 | |
64 | 64 | for testfile in tests/*.expected; do |
… |
… |
|
68 | 68 | |
69 | 69 | cat >>Makefile <<'EOF_MAKEFILE_TAIL' |
70 | 70 | |
| 71 | EXTRA_CLEAN = $(SELF_TESTS) |
| 72 | |
71 | 73 | include helenos.mak |
72 | 74 | |
73 | 75 | include $(USPACE_PREFIX)/Makefile.common |
74 | 76 | |
75 | 77 | include helenos.test.mak |
76 | 78 | |
| 79 | all-test: $(SELF_TESTS) |
| 80 | |
77 | 81 | test-libpcut-%: $(OUTPUT) |
78 | 82 | $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS) |
79 | 83 | |
=== modified file 'uspace/lib/urcu/Makefile'
|
|
|
28 | 28 | |
29 | 29 | USPACE_PREFIX = ../.. |
30 | 30 | |
31 | | LIBS = $(LIBC_PREFIX)/libc.a |
32 | | |
33 | 31 | EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include |
34 | 32 | |
35 | 33 | LIBRARY = liburcu |