Changeset 3e30c0b in mainline
- Timestamp:
- 2010-01-17T11:02:13Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3c081d0e
- Parents:
- cec261e (diff), 8416d46 (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. - Location:
- uspace/srv
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/Makefile.common
rcec261e r3e30c0b 50 50 SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint 51 51 52 LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld 53 52 54 JOB = $(OUTPUT).job 53 55 … … 67 69 $(LIBS) \ 68 70 \ 69 $(OUTPUT) $(OUTPUT).disasm 71 $(OUTPUT) $(OUTPUT).disasm \ 72 $(EXTRA_OUTPUT) 70 73 -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) 71 74 72 75 clean: 73 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm 76 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(EXTRA_OUTPUT) 74 77 find . -name '*.o' -follow -exec rm \{\} \; 75 78 … … 82 85 83 86 $(OUTPUT): $(OBJECTS) $(LIBS) 84 $(LD) -T $(LI BC_PREFIX)/arch/$(UARCH)/_link.ld$(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map87 $(LD) -T $(LINK_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map 85 88 86 89 %.o: %.c $(DEPEND) -
uspace/srv/loader/Makefile
rcec261e r3e30c0b 34 34 LIBS = $(LIBC_PREFIX)/libc.a 35 35 EXTRA_CFLAGS += -Iinclude 36 LINK_SCRIPT = arch/$(UARCH)/_link.ld 36 37 37 38 OUTPUT = loader 39 EXTRA_OUTPUT = $(LINK_SCRIPT) 38 40 39 41 GENERIC_SOURCES = \ … … 46 48 47 49 include ../Makefile.common 50 51 $(LINK_SCRIPT): $(LINK_SCRIPT).in 52 $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
Note:
See TracChangeset
for help on using the changeset viewer.