Changeset a09128c in mainline for uspace/drv/usbhid/Makefile

Timestamp:

2011-01-28T21:43:12Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0c3beeb, 4687fcd4, c2772b8

Parents:

c113056 (diff), 632ed68 (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: Doc update, usbkbd is usbhid, PCI I/O regs

Renamed usbkbd driver to usbhid.

Implemented ticket 46 (Get addresses of I/O registers from PCI).

Add some Doxygen groups (for usbhid driver and usbinfo application).

File:

• uspace/drv/usbhid/Makefile (moved) (moved from uspace/drv/usbkbd/Makefile ) (3 diffs)

uspace/drv/usbhid/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2010 Vojtech Horky
+# Copyright (c) 2010-2011 Vojtech Horky
 # All rights reserved.
 #
@@ -30 +30 @@
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
-BINARY = usbkbd
-SRV_KBD = $(USPACE_PREFIX)/srv/hid/kbd
+BINARY = usbhid
+
+STOLEN_LAYOUT_SOURCES = \
+        layout/us_qwerty.c \
+        layout/us_dvorak.c \
+        layout/cz.c
 
 SOURCES = \
@@ -38 +42 @@
         descdump.c \
         conv.c \
-        us_qwerty.c \
-        us_dvorak.c \
-        cz.c
+        $(STOLEN_LAYOUT_SOURCES)
+
+EXTRA_CLEAN = $(STOLEN_LAYOUT_SOURCES)
+
+SRV_KBD = $(USPACE_PREFIX)/srv/hid/kbd
 
 include $(USPACE_PREFIX)/Makefile.common
 
-us_qwerty.c:
-        ln -snf $(SRV_KBD)/layout/$@ $@
-
-us_dvorak.c:
-        ln -snf $(SRV_KBD)/layout/$@ $@
-
-cz.c:
-        ln -snf $(SRV_KBD)/layout/$@ $@
-
-
+layout/%.c: $(SRV_KBD)/layout/%.c
+        ln -sfn ../$< $@