Changeset 18cc83c in mainline for uspace/Makefile.common
- Timestamp:
- 2014-09-29T14:28:32Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 21799398, 43dd72b7, 6eb957dc
- Parents:
- 6609050 (diff), da4e695 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r6609050 r18cc83c 78 78 JOB = $(BINARY).job 79 79 OUTPUT = $(BINARY) 80 TEST_BINARY = test-$(BINARY) 80 81 EXTRA_OUTPUT += $(BINARY).disasm 81 82 EXTRA_CLEAN += $(BINARY).map … … 85 86 JOB = $(LIBRARY).job 86 87 OUTPUT = $(LIBRARY).a 88 TEST_BINARY = test-$(LIBRARY) 87 89 endif 88 90 … … 201 203 endif 202 204 205 # PCUT-based unit tests 206 ifneq ($(TEST_SOURCES),) 207 TEST_OUTPUT = $(TEST_BINARY) 208 TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__ 209 TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a 210 EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map 211 ifneq ($(LIBRARY),) 212 TEST_OUTPUT_LIBS += $(OUTPUT) 213 endif 214 TEST_OUTPUT_LIBS += $(TEST_LIBS) 215 endif 216 203 217 .PHONY: all clean 204 218 205 219 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT) 206 220 -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV) 221 222 all-test: $(TEST_OUTPUT) 207 223 208 224 clean: … … 295 311 OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) 296 312 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES))) 313 TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES))) 297 314 298 315 ifneq ($(BINARY),) … … 339 356 endif 340 357 358 ifneq ($(TEST_OUTPUT),) 359 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) 360 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS) 361 ifeq ($(CONFIG_STRIP_BINARIES),y) 362 $(STRIP) $(TEST_OUTPUT) 363 endif 364 endif 365 341 366 %.o: %.S $(DEPEND) 342 367 $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@ … … 357 382 endif 358 383 384 %.test.o: %.c $(DEPEND) 385 $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@ 386 ifeq ($(PRECHECK),y) 387 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) 388 endif 389 359 390 %.lo: %.S $(DEPEND) 360 391 $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@ … … 376 407 377 408 $(DEPEND): $(PRE_DEPEND) 378 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null409 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null 379 410 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 380 411
Note:
See TracChangeset
for help on using the changeset viewer.