Changes in uspace/Makefile [f902d36:a3eeef45] in mainline

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/getterm \
         app/init \
-        app/kill \
-        app/killall \
         app/klog \
         app/mkfat \
@@ -55 +53 @@
         app/nettest2 \
         app/ping \
-        app/websrv \
         app/sysinfo \
         srv/clip \
@@ -80 +77 @@
         srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
-        srv/hw/netif/ne2000 \
+        srv/hw/netif/dp8390 \
+        srv/net/cfg \
         srv/net/netif/lo \
         srv/net/il/arp \
@@ -96 +94 @@
 #
 
-DIRS += \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy
+ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
+        LIBN = \
+                srv/net/nil/eth \
+                srv/net/nil/nildummy
+else
+        DIRS += \
+                srv/net/nil/eth \
+                srv/net/nil/nildummy
+endif
 
 ## Platform-specific hardware support
@@ -108 +112 @@
 
 ifeq ($(UARCH),amd64)
-        DIRS += \
-                drv/rootpc \
-                drv/pciintel \
-                drv/isa \
-                drv/ns8250 \
-                srv/hw/irc/apic \
-                srv/hw/irc/i8259
+        DIRS += drv/rootpc
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += \
-                drv/rootpc \
-                drv/pciintel \
-                drv/isa \
-                drv/ns8250 \
-                srv/hw/irc/apic \
-                srv/hw/irc/i8259
+        DIRS += drv/rootpc
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
@@ -133 +131 @@
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/hw/irc/fhc \
-                srv/hw/irc/obio
+                srv/hw/cir/fhc \
+                srv/hw/cir/obio
 endif