Changeset 0dc2fec in mainline for uspace/Makefile

Timestamp:

2016-05-22T19:19:43Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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) (3 diffs)

uspace/Makefile

@@ -143 +143 @@
         drv/char/pl050 \
         drv/char/ps2mouse \
+        drv/char/atkbd \
         drv/char/xtkbd \
         drv/test/test1 \
@@ -249 +250 @@
         lib/trackmod \
         lib/uri \
-        lib/urcu \
         lib/usb \
         lib/usbhost \
@@ -273 +273 @@
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BUILDS)
+$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
         $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)