Changes in boot/Makefile.common [15b592b:f658458] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r15b592b rf658458  
    11#
    2 # Copyright (c) 2006 Martin Decky
     2# Copyright (c) 2009 Martin Decky
    33# All rights reserved.
    44#
     
    2727#
    2828
    29 ## Configuration
    30 #
     29-include ../Makefile.config
    3130
    32 ROOT_PATH = ..
    33 
    34 VERSION_DEF = $(ROOT_PATH)/version
    35 
    36 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    37 COMMON_HEADER = $(ROOT_PATH)/common.h
    38 COMMON_HEADER_ARCH = arch/$(BARCH)/include/common.h
    39 
    40 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    41 CONFIG_HEADER = $(ROOT_PATH)/config.h
    42 
    43 -include $(VERSION_DEF)
    44 -include $(COMMON_MAKEFILE)
    45 -include $(CONFIG_MAKEFILE)
    46 
    47 KERNEL_PATH = $(ROOT_PATH)/kernel
    48 USPACE_PATH = $(ROOT_PATH)/uspace
    49 DIST_PATH = $(USPACE_PATH)/dist
    50 TOOLS_PATH = $(ROOT_PATH)/tools
    51 
    52 SANDBOX = pack
    53 PACK = $(TOOLS_PATH)/pack.py
    54 MKHORD = $(TOOLS_PATH)/mkhord.py
    55 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
    56 MKFAT = $(TOOLS_PATH)/mkfat.py
    57 
    58 JOBFILE = $(ROOT_PATH)/tools/jobfile.py
    59 
    60 ARCH_INCLUDE = generic/include/arch
    61 GENARCH_INCLUDE = generic/include/genarch
    62 
    63 DEPEND = Makefile.depend
    64 DEPEND_PREV = $(DEPEND).prev
    65 DISTROOT = distroot
     31TMP = distroot
    6632INITRD = initrd
    6733
    6834INIT_TASKS = \
    69         $(USPACE_PATH)/srv/ns/ns \
    70         $(USPACE_PATH)/srv/loader/loader \
    71         $(USPACE_PATH)/app/init/init \
    72         $(USPACE_PATH)/srv/devmap/devmap \
    73         $(USPACE_PATH)/srv/bd/rd/rd \
    74         $(USPACE_PATH)/srv/vfs/vfs
    75 
     35        $(USPACEDIR)/srv/ns/ns \
     36        $(USPACEDIR)/srv/loader/loader \
     37        $(USPACEDIR)/app/init/init \
     38        $(USPACEDIR)/srv/devmap/devmap \
     39        $(USPACEDIR)/srv/bd/rd/rd \
     40        $(USPACEDIR)/srv/vfs/vfs
    7641ifeq ($(RDFMT),tmpfs)
    77         INIT_TASKS += $(USPACE_PATH)/srv/fs/tmpfs/tmpfs
     42        INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
     43endif
     44ifeq ($(RDFMT),fat)
     45        INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
    7846endif
    7947
    80 ifeq ($(RDFMT),fat)
    81         INIT_TASKS += $(USPACE_PATH)/srv/fs/fat/fat
    82 endif
     48RD_SRVS = \
     49        $(USPACEDIR)/srv/devman/devman \
     50        $(USPACEDIR)/srv/bd/file_bd/file_bd \
     51        $(USPACEDIR)/srv/bd/part/guid_part/g_part \
     52        $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
     53        $(USPACEDIR)/srv/clip/clip \
     54        $(USPACEDIR)/srv/hid/fb/fb \
     55        $(USPACEDIR)/srv/hid/kbd/kbd \
     56        $(USPACEDIR)/srv/hid/console/console \
     57        $(USPACEDIR)/srv/fs/devfs/devfs \
     58        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     59        $(USPACEDIR)/srv/fs/fat/fat \
     60        $(USPACEDIR)/srv/taskmon/taskmon
    8361
    84 RD_SRVS_ESSENTIAL = \
    85         $(USPACE_PATH)/srv/hid/fb/fb \
    86         $(USPACE_PATH)/srv/hid/kbd/kbd \
    87         $(USPACE_PATH)/srv/hid/console/console \
    88         $(USPACE_PATH)/srv/fs/devfs/devfs
    89 
    90 RD_SRVS_NON_ESSENTIAL = \
    91         $(USPACE_PATH)/srv/bd/file_bd/file_bd \
    92         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
    93         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
    94         $(USPACE_PATH)/srv/clip/clip \
    95         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    96         $(USPACE_PATH)/srv/fs/fat/fat \
    97         $(USPACE_PATH)/srv/taskmon/taskmon \
    98         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
    99         $(USPACE_PATH)/srv/net/netif/lo/lo \
    100         $(USPACE_PATH)/srv/net/il/arp/arp \
    101         $(USPACE_PATH)/srv/net/il/ip/ip \
    102         $(USPACE_PATH)/srv/net/tl/icmp/icmp \
    103         $(USPACE_PATH)/srv/net/tl/udp/udp \
    104         $(USPACE_PATH)/srv/net/tl/tcp/tcp \
    105         $(USPACE_PATH)/srv/net/net/net \
    106         $(USPACE_PATH)/srv/net/netstart/netstart \
    107 
    108 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    109         RD_SRVS_NON_ESSENTIAL += \
    110                 $(USPACE_PATH)/srv/net/nil/eth/eth \
    111                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
    112 endif
    113 
    114 RD_APPS_ESSENTIAL = \
    115         $(USPACE_PATH)/app/bdsh/bdsh \
    116         $(USPACE_PATH)/app/getterm/getterm \
    117         $(USPACE_PATH)/app/klog/klog
    118 
    119 RD_APPS_NON_ESSENTIAL = \
    120         $(USPACE_PATH)/app/edit/edit \
    121         $(USPACE_PATH)/app/mkfat/mkfat \
    122         $(USPACE_PATH)/app/sbi/sbi \
    123         $(USPACE_PATH)/app/redir/redir \
    124         $(USPACE_PATH)/app/taskdump/taskdump \
    125         $(USPACE_PATH)/app/tester/tester \
    126         $(USPACE_PATH)/app/tetris/tetris \
    127         $(USPACE_PATH)/app/trace/trace \
    128         $(USPACE_PATH)/app/nettest1/nettest1 \
    129         $(USPACE_PATH)/app/nettest2/nettest2 \
    130         $(USPACE_PATH)/app/netecho/netecho \
    131         $(USPACE_PATH)/app/ping/ping \
    132         $(USPACE_PATH)/app/stats/stats \
    133         $(USPACE_PATH)/app/tasks/tasks \
    134         $(USPACE_PATH)/app/top/top
    135 
    136 ifneq ($(CONFIG_BAREBONE),y)
    137 NET_CFG = \
    138         $(USPACE_PATH)/srv/net/cfg/general \
    139         $(USPACE_PATH)/srv/net/cfg/lo \
    140         $(USPACE_PATH)/srv/net/cfg/ne2k
    141 endif
     62RD_APPS = \
     63        $(USPACEDIR)/app/bdsh/bdsh \
     64        $(USPACEDIR)/app/edit/edit \
     65        $(USPACEDIR)/app/getterm/getterm \
     66        $(USPACEDIR)/app/klog/klog \
     67        $(USPACEDIR)/app/mkfat/mkfat \
     68        $(USPACEDIR)/app/redir/redir \
     69        $(USPACEDIR)/app/taskdump/taskdump \
     70        $(USPACEDIR)/app/tester/tester \
     71        $(USPACEDIR)/app/tetris/tetris \
     72        $(USPACEDIR)/app/trace/trace \
     73        $(USPACEDIR)/app/test_serial/test_serial
    14274
    14375COMPONENTS = \
    144         $(KERNEL_PATH)/kernel.bin \
    145         $(INIT_TASKS) \
    146         $(INITRD).img
    147 
    148 LINK = arch/$(BARCH)/_link.ld
    149 COMPS_H = arch/$(BARCH)/include/_components.h
    150 COMPS_C = arch/$(BARCH)/src/_components.c
    151 
    152 -include arch/$(BARCH)/Makefile.inc
    153 
    154 ifeq ($(CONFIG_BAREBONE),y)
    155 RD_SRVS = $(RD_SRVS_ESSENTIAL)
    156 RD_APPS = $(RD_APPS_ESSENTIAL)
    157 else
    158 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
    159 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
     76        $(KERNELDIR)/kernel.bin \
     77        $(USPACEDIR)/srv/ns/ns \
     78        $(USPACEDIR)/srv/loader/loader \
     79        $(USPACEDIR)/app/init/init \
     80        $(USPACEDIR)/srv/devmap/devmap \
     81        $(USPACEDIR)/srv/bd/rd/rd \
     82        $(USPACEDIR)/srv/vfs/vfs
     83ifeq ($(RDFMT),tmpfs)
     84        COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
    16085endif
    161 
    162 MODULES := $(notdir $(COMPONENTS))
    163 
    164 BOOT_OUTPUT ?= $(ROOT_PATH)/image.boot
    165 RAW ?= image.raw
    166 JOB ?= image.job
    167 MAP ?= image.map
    168 PREBUILD ?= build_comps
    169 BUILD ?= Makefile.build
     86ifeq ($(RDFMT),fat)
     87        COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
     88endif
Note: See TracChangeset for help on using the changeset viewer.