Changes in / [3e30c0b:cec261e] in mainline
- Location:
- uspace/srv
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/Makefile.common
r3e30c0b rcec261e 50 50 SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint 51 51 52 LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld53 54 52 JOB = $(OUTPUT).job 55 53 … … 69 67 $(LIBS) \ 70 68 \ 71 $(OUTPUT) $(OUTPUT).disasm \ 72 $(EXTRA_OUTPUT) 69 $(OUTPUT) $(OUTPUT).disasm 73 70 -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) 74 71 75 72 clean: 76 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(EXTRA_OUTPUT)73 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm 77 74 find . -name '*.o' -follow -exec rm \{\} \; 78 75 … … 85 82 86 83 $(OUTPUT): $(OBJECTS) $(LIBS) 87 $(LD) -T $(LI NK_SCRIPT)$(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map84 $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map 88 85 89 86 %.o: %.c $(DEPEND) -
uspace/srv/loader/Makefile
r3e30c0b rcec261e 34 34 LIBS = $(LIBC_PREFIX)/libc.a 35 35 EXTRA_CFLAGS += -Iinclude 36 LINK_SCRIPT = arch/$(UARCH)/_link.ld37 36 38 37 OUTPUT = loader 39 EXTRA_OUTPUT = $(LINK_SCRIPT)40 38 41 39 GENERIC_SOURCES = \ … … 48 46 49 47 include ../Makefile.common 50 51 $(LINK_SCRIPT): $(LINK_SCRIPT).in52 $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
Note:
See TracChangeset
for help on using the changeset viewer.