Changeset 54d71e1 in mainline for uspace/app/vuhid/Makefile

Timestamp:

2011-04-29T07:05:30Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

361fcec

Parents:

9014dcd (diff), cd4ae1e (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 with development

File:

• uspace/app/vuhid/Makefile (moved) (moved from uspace/app/virtusbhub/Makefile ) (1 diff)

uspace/app/vuhid/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-# acronym for virtual USB hub
+# acronym for virtual USB human input device
 # (it is really annoying to write long names)
 BINARY = vuh
 
-LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
-EXTRA_CFLAGS = -DSTANDALONE_HUB \
-        -DHUB_PORT_COUNT=10 \
-        -I$(LIBUSB_PREFIX)/include -I$(LIBUSBVIRT_PREFIX)/include -I$(LIBDRV_PREFIX)/include
+LIBS = \
+        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
+        $(LIBUSB_PREFIX)/libusb.a
+EXTRA_CFLAGS = \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBVIRT_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
+
+
+SOURCES_INTERFACES = \
+        hids/bootkbd.c
 
 SOURCES = \
         main.c \
-        $(STOLEN_VHC_SOURCES)
-
-STOLEN_VHC_SOURCES = \
-        vhc_hub/hub.c \
-        vhc_hub/virthub.c \
-        vhc_hub/virthubops.c 
-STOLEN_VHC_HEADERS = \
-        vhc_hub/hub.h \
-        vhc_hub/virthub.h
-
-PRE_DEPEND = $(STOLEN_VHC_SOURCES) $(STOLEN_VHC_HEADERS)
-
-EXTRA_CLEAN = $(STOLEN_VHC_SOURCES) $(STOLEN_VHC_HEADERS)
-
-HUB_IN_VHC = $(USPACE_PREFIX)/drv/vhc/hub
+        device.c \
+        ifaces.c \
+        stdreq.c \
+        $(SOURCES_INTERFACES)
+        
 
 include $(USPACE_PREFIX)/Makefile.common
-
-vhc_hub/%.h: $(HUB_IN_VHC)/%.h
-        ln -sfn ../$(HUB_IN_VHC)/$*.h $@
-vhc_hub/%.c: $(HUB_IN_VHC)/%.c
-        ln -sfn ../$(HUB_IN_VHC)/$*.c $@