Changes in uspace/Makefile [849ed54:3d482e0] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    r849ed54 r3d482e0  
    4242        app/redir \
    4343        app/sbi \
     44        app/stats \
    4445        app/taskdump \
     46        app/tasks \
    4547        app/tester \
    4648        app/tetris \
    4749        app/trace \
     50        app/top \
     51        app/dummy_load \
    4852        srv/clip \
    4953        srv/devmap \
     
    6670        srv/hid/kbd \
    6771        srv/hw/char/i8042 \
    68         srv/hw/netif/dp8390
     72        srv/hw/netif/dp8390 \
     73        srv/net/cfg \
     74        srv/net/netif/lo \
     75        srv/net/il/arp \
     76        srv/net/il/ip \
     77        srv/net/tl/icmp \
     78        srv/net/tl/udp \
     79        srv/net/tl/tcp \
     80        srv/net/net \
     81        srv/net/netstart \
     82        app/netecho \
     83        app/nettest1 \
     84        app/nettest2 \
     85        app/ping
     86
     87## Networking
     88#
     89
     90ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     91        LIBN = \
     92                srv/net/nil/eth \
     93                srv/net/nil/nildummy
     94else
     95        DIRS += \
     96                srv/net/nil/eth \
     97                srv/net/nil/nildummy
     98endif
    6999
    70100## Platform-specific hardware support
     
    93123endif
    94124
    95 ## Networking
    96 #
    97 
    98 NETWORKING_COMMON = \
    99         srv/net/netif/lo \
    100         srv/net/nil/eth \
    101         srv/net/nil/nildummy \
    102         srv/net/net \
    103         srv/net/netstart \
    104         app/netecho \
    105         app/nettest1 \
    106         app/nettest2 \
    107         app/ping
    108 
    109 NETWORKING_MODULAR = \
    110         srv/net/il/arp \
    111         srv/net/il/ip \
    112         srv/net/tl/icmp \
    113         srv/net/tl/udp \
    114         srv/net/tl/tcp
    115 
    116125## System libraries
    117126#
     
    125134        lib/softfloat \
    126135        lib/socket \
    127         lib/net \
    128         lib/netif
     136        lib/net
    129137
    130138ifeq ($(UARCH),amd64)
     
    139147LIBC_BUILD = $(addsuffix .build,$(LIBC))
    140148LIBS_BUILD = $(addsuffix .build,$(LIBS))
     149LIBN_BUILD = $(addsuffix .build,$(LIBN))
     150BUILDS := $(addsuffix .build,$(DIRS))
    141151
    142 ifeq ($(CONFIG_NETWORKING),modular)
    143         BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
    144 endif
     152CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
    145153
    146 ifeq ($(CONFIG_NETWORKING),module)
    147         BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON))
    148 endif
    149 
    150 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(NETWORKING_COMMON)) $(addsuffix .clean,$(NETWORKING_MODULAR)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
    151 
    152 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
     154.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
    153155
    154156all: $(BUILDS)
     
    159161        -$(MAKE) -C $(basename $@) clean
    160162
    161 $(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
     163$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
     164        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
     165
     166$(LIBN_BUILD): $(LIBC_BUILD) $(LIBS_BUILD)
    162167        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    163168
Note: See TracChangeset for help on using the changeset viewer.