Changeset 8e7c9fe in mainline for uspace/app/viewer/Makefile

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/app/viewer/Makefile (modified) (1 diff)

uspace/app/viewer/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBGUI_PREFIX)/libgui.a $(LIBDRAW_PREFIX)/libdraw.a \
-        $(LIBSOFTREND_PREFIX)/libsoftrend.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-EXTRA_CFLAGS += -I$(LIBGUI_PREFIX) -I$(LIBDRAW_PREFIX) \
+
+LIBS = \
+        $(LIBGUI_PREFIX)/libgui.a \
+        $(LIBDRAW_PREFIX)/libdraw.a \
+        $(LIBSOFTREND_PREFIX)/libsoftrend.a \
+        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+
+EXTRA_CFLAGS += \
+        -I$(LIBGUI_PREFIX) \
+        -I$(LIBDRAW_PREFIX) \
         -I$(LIBSOFTREND_PREFIX)
+
 BINARY = viewer
+MATH = y
 
 SOURCES = \