Changeset 03362fbd in mainline for uspace/srv/hid/input/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/srv/hid/input/Makefile (modified) (2 diffs)

uspace/srv/hid/input/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../../..
-EXTRA_CFLAGS = -Iinclude
 BINARY = input
 
 SOURCES = \
-        generic/gsp.c \
-        generic/input.c \
-        generic/layout.c \
-        generic/stroke.c \
         layout/cz.c \
         layout/us_qwerty.c \
         layout/us_dvorak.c \
+        layout/ar.c \
         port/adb.c \
         port/adb_mouse.c \
@@ -56 +52 @@
         ctl/pc.c \
         ctl/stty.c \
-        ctl/sun.c
+        ctl/sun.c \
+        gsp.c \
+        input.c \
+        layout.c \
+        stroke.c
 
 include $(USPACE_PREFIX)/Makefile.common