diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-08 14:39:01 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-08 14:39:01 -0500 |
| commit | f7cc38b16e2741186253be3dff61a9d124112126 (patch) | |
| tree | efce170d7c0c4baf6924275e6a42d11fa47c9290 /tools/usb/usbip/src/Makefile.am | |
| parent | efb540c895d2cb77b1472edda6ca45d40719a041 (diff) | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
Merge tag 'v3.17-rc4' into next
Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/Makefile
drivers/usb/phy/phy-samsung-usb.h
Diffstat (limited to 'tools/usb/usbip/src/Makefile.am')
| -rw-r--r-- | tools/usb/usbip/src/Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/usb/usbip/src/Makefile.am b/tools/usb/usbip/src/Makefile.am new file mode 100644 index 000000000000..e81a4ebadeff --- /dev/null +++ b/tools/usb/usbip/src/Makefile.am @@ -0,0 +1,11 @@ +AM_CPPFLAGS = -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"' +AM_CFLAGS = @EXTRA_CFLAGS@ +LDADD = $(top_builddir)/libsrc/libusbip.la + +sbin_PROGRAMS := usbip usbipd + +usbip_SOURCES := usbip.h utils.h usbip.c utils.c usbip_network.c \ + usbip_attach.c usbip_detach.c usbip_list.c \ + usbip_bind.c usbip_unbind.c usbip_port.c + +usbipd_SOURCES := usbip_network.h usbipd.c usbip_network.c |