Changeset 1b1164e8 in mainline for uspace/srv/loader/Makefile


Ignore:
Timestamp:
2010-03-23T14:44:00Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
63f8966
Parents:
d99c1d2
Message:

unify and simplify user space makefiles
rename NETWORKING configuration option to CONFIG_NETWORKING

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/loader/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 -include ../../../Makefile.common
    31 -include ../../../Makefile.config
     30USPACE_PREFIX = ../..
     31ROOT_PATH = $(USPACE_PREFIX)/..
     32
     33COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     34CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     35
     36-include $(COMMON_MAKEFILE)
     37-include $(CONFIG_MAKEFILE)
    3238-include arch/$(UARCH)/Makefile.inc
    3339
    34 USPACE_PREFIX = ../..
    35 LIBS = $(LIBC_PREFIX)/libc.a
    36 EXTRA_CFLAGS += -Iinclude
    37 LINK_SCRIPT = arch/$(UARCH)/_link.ld
     40LINKER_SCRIPT = arch/$(UARCH)/_link.ld
     41EXTRA_CLEAN = $(LINKER_SCRIPT)
    3842
    39 OUTPUT = loader
    40 EXTRA_OUTPUT = $(LINK_SCRIPT)
     43EXTRA_CFLAGS = -Iinclude
     44
     45BINARY = loader
    4146
    4247GENERIC_SOURCES = \
    … …  
    4550        interp.s
    4651
    47 SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
    48 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
     52SOURCES = \
     53        $(GENERIC_SOURCES) \
     54        $(ARCH_SOURCES)
    4955
    50 include ../Makefile.common
     56include $(USPACE_PREFIX)/Makefile.common
    5157
    52 $(LINK_SCRIPT): $(LINK_SCRIPT).in
     58$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
    5359        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
Note: See TracChangeset for help on using the changeset viewer.