Changeset 03362fbd in mainline for uspace/app/logset/Makefile

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/app/logset/Makefile (moved) (moved from uspace/app/lsusb/Makefile ) (2 diffs)

uspace/app/logset/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2011 Vojtech Horky
+# Copyright (c) 2012 Vojtech Horky
 # All rights reserved.
 #
@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-BINARY = lsusb
-
-LIBS = \
-        $(LIBUSBDEV_PREFIX)/libusbdev.a \
-        $(LIBUSB_PREFIX)/libusb.a \
-        $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = \
-        -I$(LIBUSB_PREFIX)/include \
-        -I$(LIBUSBDEV_PREFIX)/include \
-        -I$(LIBDRV_PREFIX)/include
+BINARY = logset
 
 SOURCES = \