Changeset f1fae414 in mainline for uspace/drv/bus/usb/usbhid/Makefile

Timestamp:

2011-06-22T01:34:53Z (15 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/drv/bus/usb/usbhid/Makefile (moved) (moved from uspace/drv/usbhid/Makefile ) (4 diffs)

uspace/drv/bus/usb/usbhid/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../../..
 
 LIBS = \
@@ -34 +34 @@
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
+
 EXTRA_CFLAGS += \
         -I. \
@@ -43 +44 @@
 BINARY = usbhid
 
-STOLEN_LAYOUT_SOURCES = \
-        kbd/layout/us_qwerty.c \
-        kbd/layout/us_dvorak.c \
-        kbd/layout/cz.c
+SUBDRIVER_SOURCES = \
+        kbd/conv.c \
+        kbd/kbddev.c \
+        kbd/kbdrepeat.c \
+        mouse/mousedev.c \
+        multimedia/multimedia.c \
+        multimedia/keymap.c
 
 SOURCES = \
@@ -52 +56 @@
         usbhid.c \
         subdrivers.c \
-        kbd/conv.c \
-        kbd/kbddev.c \
-        kbd/kbdrepeat.c \
         generic/hiddev.c \
-        mouse/mousedev.c \
-        multimedia/multimedia.c \
-        multimedia/keymap.c \
-        $(STOLEN_LAYOUT_SOURCES)
-
-EXTRA_CLEAN = $(STOLEN_LAYOUT_SOURCES)
-
-SRV_KBD = $(USPACE_PREFIX)/srv/hid/kbd
+        $(SUBDRIVER_SOURCES)
 
 include $(USPACE_PREFIX)/Makefile.common
-
-kbd/layout/%.c: $(SRV_KBD)/layout/%.c
-        ln -sfn ../../$< $@