Changeset 0c2d9bb in mainline for uspace/Makefile

Timestamp:

2013-12-25T22:54:29Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/Makefile (modified) (7 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/blkdump \
         app/bnchmark \
+        app/corecfg \
         app/devctl \
         app/dnscfg \
         app/dnsres \
+        app/download \
         app/edit \
         app/getterm \
+        app/hdisk \
         app/init \
         app/inet \
@@ -66 +69 @@
         app/trace \
         app/top \
+        app/untar \
         app/usbinfo \
         app/vuhid \
         app/netecho \
+        app/netspeed \
         app/nettest1 \
         app/nettest2 \
         app/nettest3 \
         app/ping \
-        app/ping6 \
         app/sysinfo \
         app/mkbd \
         app/date \
         app/vdemo \
+        app/viewer \
         app/vlaunch \
         app/vterm \
+        app/df \
         app/wavplay \
         app/websrv \
@@ -88 +94 @@
         srv/devman \
         srv/loader \
+        srv/net/dhcp \
         srv/net/dnsrsrv \
         srv/net/ethip \
         srv/net/inetsrv \
         srv/net/loopip \
+        srv/net/nconfsrv \
         srv/net/slip \
         srv/net/tcp \
@@ -119 +127 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hid/rfb \
         drv/audio/sb16 \
         drv/infrastructure/root \
@@ -188 +197 @@
 endif
 
+ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+        DIRS += \
+                drv/infrastructure/rootmalta \
+                drv/bus/pci/pciintel \
+                drv/bus/isa
+endif
+
 ifeq ($(UARCH),ppc32)
         DIRS += \
@@ -222 +238 @@
         lib/gui \
         lib/hound \
+        lib/http \
         lib/softrend \
         lib/draw \
+        lib/math \
         lib/net \
         lib/nic \
         lib/ext4 \
+        lib/uri \
         lib/usb \
         lib/usbhost \
@@ -234 +253 @@
         lib/pcm \
         lib/bithenge \
-        lib/posix
+        lib/posix \
+        lib/mbr \
+        lib/gpt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))