Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/loader/Makefile

    r1b1164e8 r3c081d0e  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 ROOT_PATH = $(USPACE_PREFIX)/..
    32 
    33 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    34 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    35 
    36 -include $(COMMON_MAKEFILE)
    37 -include $(CONFIG_MAKEFILE)
     30-include ../../../Makefile.config
    3831-include arch/$(UARCH)/Makefile.inc
    3932
    40 LINKER_SCRIPT = arch/$(UARCH)/_link.ld
    41 EXTRA_CLEAN = $(LINKER_SCRIPT)
     33USPACE_PREFIX = ../..
     34LIBS = $(LIBC_PREFIX)/libc.a
     35EXTRA_CFLAGS += -Iinclude
     36LINK_SCRIPT = arch/$(UARCH)/_link.ld
    4237
    43 EXTRA_CFLAGS = -Iinclude
    44 
    45 BINARY = loader
     38OUTPUT = loader
     39EXTRA_OUTPUT = $(LINK_SCRIPT)
    4640
    4741GENERIC_SOURCES = \
     
    5044        interp.s
    5145
    52 SOURCES = \
    53         $(GENERIC_SOURCES) \
    54         $(ARCH_SOURCES)
     46SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
     47OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5548
    56 include $(USPACE_PREFIX)/Makefile.common
     49include ../Makefile.common
    5750
    58 $(LINKER_SCRIPT): $(LINKER_SCRIPT).in
     51$(LINK_SCRIPT): $(LINK_SCRIPT).in
    5952        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
Note: See TracChangeset for help on using the changeset viewer.