Changes in uspace/Makefile.common [865b981:af0a2c7] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r865b981 raf0a2c7 78 78 JOB = $(BINARY).job 79 79 OUTPUT = $(BINARY) 80 TEST_BINARY = test-$(BINARY)81 80 EXTRA_OUTPUT += $(BINARY).disasm 82 81 EXTRA_CLEAN += $(BINARY).map … … 86 85 JOB = $(LIBRARY).job 87 86 OUTPUT = $(LIBRARY).a 88 TEST_BINARY = test-$(LIBRARY)89 87 endif 90 88 … … 202 200 endif 203 201 204 # PCUT-based unit tests205 ifneq ($(TEST_SOURCES),)206 TEST_OUTPUT = $(TEST_BINARY)207 TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__208 TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a209 EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map210 ifneq ($(LIBRARY),)211 TEST_OUTPUT_LIBS += $(OUTPUT)212 endif213 TEST_OUTPUT_LIBS += $(TEST_LIBS)214 endif215 216 202 .PHONY: all clean 217 203 218 204 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT) 219 205 -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV) 220 221 all-test: $(TEST_OUTPUT)222 206 223 207 clean: … … 310 294 OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) 311 295 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES))) 312 TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES)))313 296 314 297 ifneq ($(BINARY),) … … 355 338 endif 356 339 357 ifneq ($(TEST_OUTPUT),)358 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)359 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)360 ifeq ($(CONFIG_STRIP_BINARIES),y)361 $(STRIP) $(TEST_OUTPUT)362 endif363 endif364 365 340 %.o: %.S $(DEPEND) 366 341 $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@ … … 381 356 endif 382 357 383 %.test.o: %.c $(DEPEND)384 $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@385 ifeq ($(PRECHECK),y)386 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)387 endif388 389 358 %.lo: %.S $(DEPEND) 390 359 $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@ … … 406 375 407 376 $(DEPEND): $(PRE_DEPEND) 408 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES)> $@ 2> /dev/null377 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null 409 378 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 410 379
Note:
See TracChangeset
for help on using the changeset viewer.