Index: uspace/drv/audio/hdaudio/Makefile =================================================================== --- uspace/drv/audio/hdaudio/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/audio/hdaudio/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBPCM_PREFIX)/include +LIBS = drv pcm BINARY = hdaudio Index: uspace/drv/audio/sb16/Makefile =================================================================== --- uspace/drv/audio/sb16/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/audio/sb16/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,9 +29,5 @@ USPACE_PREFIX = ../../.. -LIBS = \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBDRV_PREFIX)/include -I$(LIBPCM_PREFIX)/include +LIBS = drv pcm BINARY = sb16 Index: uspace/drv/block/ahci/Makefile =================================================================== --- uspace/drv/block/ahci/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/block/ahci/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = ahci Index: uspace/drv/block/ata_bd/Makefile =================================================================== --- uspace/drv/block/ata_bd/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/block/ata_bd/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include +LIBS = drv scsi BINARY = ata_bd Index: uspace/drv/block/ddisk/Makefile =================================================================== --- uspace/drv/block/ddisk/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/block/ddisk/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include +LIBS = drv scsi BINARY = ddisk Index: uspace/drv/bus/adb/cuda_adb/Makefile =================================================================== --- uspace/drv/bus/adb/cuda_adb/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/adb/cuda_adb/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = cuda_adb Index: uspace/drv/bus/isa/Makefile =================================================================== --- uspace/drv/bus/isa/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/isa/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,6 +29,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = isa Index: uspace/drv/bus/pci/pciintel/Makefile =================================================================== --- uspace/drv/bus/pci/pciintel/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/pci/pciintel/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = pciintel Index: uspace/drv/bus/usb/ehci/Makefile =================================================================== --- uspace/drv/bus/usb/ehci/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/ehci/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,16 +29,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBHOST_PREFIX)/libusbhost.a \ - $(LIBUSBVIRT_PREFIX)/libusbvirt.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBUSBHOST_PREFIX)/include \ - -I$(LIBUSBVIRT_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +LIBS = usbhost usbvirt usb drv usbdev BINARY = ehci Index: uspace/drv/bus/usb/ohci/Makefile =================================================================== --- uspace/drv/bus/usb/ohci/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/ohci/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,16 +29,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBHOST_PREFIX)/libusbhost.a \ - $(LIBUSBVIRT_PREFIX)/libusbvirt.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBUSBHOST_PREFIX)/include \ - -I$(LIBUSBVIRT_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +LIBS = usbhost usbvirt usb drv usbdev BINARY = ohci Index: uspace/drv/bus/usb/uhci/Makefile =================================================================== --- uspace/drv/bus/usb/uhci/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/uhci/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,16 +29,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBHOST_PREFIX)/libusbhost.a \ - $(LIBUSBVIRT_PREFIX)/libusbvirt.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBUSBHOST_PREFIX)/include \ - -I$(LIBUSBVIRT_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +LIBS = usbhost usbvirt usb drv usbdev BINARY = uhci Index: uspace/drv/bus/usb/usbflbk/Makefile =================================================================== --- uspace/drv/bus/usb/usbflbk/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/usbflbk/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,13 +29,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +LIBS = usbdev usb drv BINARY = usbflbk Index: uspace/drv/bus/usb/usbhid/Makefile =================================================================== --- uspace/drv/bus/usb/usbhid/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/usbhid/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,16 +29,7 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBHID_PREFIX)/libusbhid.a \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a +LIBS = usbhid usbdev usb drv -EXTRA_CFLAGS += \ - -I. \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBUSBHID_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +EXTRA_CFLAGS += -I. BINARY = usbhid Index: uspace/drv/bus/usb/usbhub/Makefile =================================================================== --- uspace/drv/bus/usb/usbhub/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/usbhub/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -30,13 +30,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +LIBS = usbdev usb drv BINARY = usbhub Index: uspace/drv/bus/usb/usbmast/Makefile =================================================================== --- uspace/drv/bus/usb/usbmast/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/usbmast/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,15 +29,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a \ - $(LIBSCSI_PREFIX)/libscsi.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include \ - -I$(LIBSCSI_PREFIX)/include +LIBS = usbdev usb drv scsi BINARY = usbmast Index: uspace/drv/bus/usb/usbmid/Makefile =================================================================== --- uspace/drv/bus/usb/usbmid/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/usbmid/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,13 +29,5 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a - -EXTRA_CFLAGS += \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include +LIBS = usbdev usb drv BINARY = usbmid Index: uspace/drv/bus/usb/vhc/Makefile =================================================================== --- uspace/drv/bus/usb/vhc/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/bus/usb/vhc/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,17 +29,6 @@ USPACE_PREFIX = ../../../.. -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSBHOST_PREFIX)/libusbhost.a \ - $(LIBUSBVIRT_PREFIX)/libusbvirt.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a +LIBS = usbdev usbhost usbvirt usb drv -EXTRA_CFLAGS += \ - -I$(LIBUSBVIRT_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBUSBHOST_PREFIX)/include \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include BINARY = vhc Index: uspace/drv/char/atkbd/Makefile =================================================================== --- uspace/drv/char/atkbd/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/char/atkbd/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = atkbd Index: uspace/drv/char/i8042/Makefile =================================================================== --- uspace/drv/char/i8042/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/char/i8042/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,6 +29,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = i8042 Index: uspace/drv/char/ns8250/Makefile =================================================================== --- uspace/drv/char/ns8250/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/char/ns8250/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = ns8250 Index: uspace/drv/char/pl050/Makefile =================================================================== --- uspace/drv/char/pl050/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/char/pl050/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = pl050 Index: uspace/drv/char/ps2mouse/Makefile =================================================================== --- uspace/drv/char/ps2mouse/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/char/ps2mouse/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = ps2mouse Index: uspace/drv/char/xtkbd/Makefile =================================================================== --- uspace/drv/char/xtkbd/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/char/xtkbd/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = xtkbd Index: uspace/drv/fb/amdm37x_dispc/Makefile =================================================================== --- uspace/drv/fb/amdm37x_dispc/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/fb/amdm37x_dispc/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -31,13 +31,5 @@ USPACE_PREFIX = ../../.. -LIBS = \ - $(LIBDRV_PREFIX)/libdrv.a \ - $(LIBGRAPH_PREFIX)/libgraph.a \ - $(LIBSOFTREND_PREFIX)/libsoftrend.a - -EXTRA_CFLAGS += \ - -I$(LIBDRV_PREFIX)/include \ - -I$(LIBGRAPH_PREFIX) \ - -I$(LIBSOFTREND_PREFIX) +LIBS = drv graph softrend BINARY = amdm37x_dispc Index: uspace/drv/fb/kfb/Makefile =================================================================== --- uspace/drv/fb/kfb/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/fb/kfb/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -30,6 +30,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBGRAPH_PREFIX)/libgraph.a $(LIBSOFTREND_PREFIX)/libsoftrend.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBGRAPH_PREFIX) -I$(LIBSOFTREND_PREFIX) +LIBS = drv graph softrend BINARY = kfb Index: uspace/drv/intctl/apic/Makefile =================================================================== --- uspace/drv/intctl/apic/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/intctl/apic/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = apic Index: uspace/drv/intctl/i8259/Makefile =================================================================== --- uspace/drv/intctl/i8259/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/intctl/i8259/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = i8259 Index: uspace/drv/intctl/icp-ic/Makefile =================================================================== --- uspace/drv/intctl/icp-ic/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/intctl/icp-ic/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = icp-ic Index: uspace/drv/intctl/obio/Makefile =================================================================== --- uspace/drv/intctl/obio/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/intctl/obio/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,6 +29,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = obio Index: uspace/drv/nic/ar9271/Makefile =================================================================== --- uspace/drv/nic/ar9271/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/nic/ar9271/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,20 +29,7 @@ USPACE_PREFIX = ../../.. -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a \ - $(LIBNIC_PREFIX)/libnic.a \ - $(LIBIEEE80211_PREFIX)/libieee80211.a \ - $(LIBCRYPTO_PREFIX)/libcrypto.a +LIBS = usbdev usb drv nic ieee80211 crypto -EXTRA_CFLAGS += \ - -I. \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include \ - -I$(LIBNIC_PREFIX)/include \ - -I$(LIBIEEE80211_PREFIX)/include \ - -I$(LIBCRYPTO_PREFIX) +EXTRA_CFLAGS += -I. BINARY = ar9271 Index: uspace/drv/nic/e1k/Makefile =================================================================== --- uspace/drv/nic/e1k/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/nic/e1k/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include +LIBS = drv nic BINARY = e1k Index: uspace/drv/nic/ne2k/Makefile =================================================================== --- uspace/drv/nic/ne2k/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/nic/ne2k/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include +LIBS = drv nic BINARY = ne2k Index: uspace/drv/nic/rtl8139/Makefile =================================================================== --- uspace/drv/nic/rtl8139/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/nic/rtl8139/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include +LIBS = drv nic BINARY = rtl8139 Index: uspace/drv/nic/rtl8169/Makefile =================================================================== --- uspace/drv/nic/rtl8169/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/nic/rtl8169/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -29,6 +29,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include +LIBS = drv nic BINARY = rtl8169 Index: uspace/drv/platform/amdm37x/Makefile =================================================================== --- uspace/drv/platform/amdm37x/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/amdm37x/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = amdm37x Index: uspace/drv/platform/icp/Makefile =================================================================== --- uspace/drv/platform/icp/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/icp/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = icp Index: uspace/drv/platform/mac/Makefile =================================================================== --- uspace/drv/platform/mac/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/mac/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = mac Index: uspace/drv/platform/malta/Makefile =================================================================== --- uspace/drv/platform/malta/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/malta/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = malta Index: uspace/drv/platform/msim/Makefile =================================================================== --- uspace/drv/platform/msim/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/msim/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = msim Index: uspace/drv/platform/pc/Makefile =================================================================== --- uspace/drv/platform/pc/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/pc/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = pc Index: uspace/drv/platform/sun4u/Makefile =================================================================== --- uspace/drv/platform/sun4u/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/platform/sun4u/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = sun4u Index: uspace/drv/root/root/Makefile =================================================================== --- uspace/drv/root/root/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/root/root/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = root Index: uspace/drv/root/virt/Makefile =================================================================== --- uspace/drv/root/virt/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/root/virt/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = virt Index: uspace/drv/test/test1/Makefile =================================================================== --- uspace/drv/test/test1/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/test/test1/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = test1 Index: uspace/drv/test/test2/Makefile =================================================================== --- uspace/drv/test/test2/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/test/test2/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = test2 Index: uspace/drv/test/test3/Makefile =================================================================== --- uspace/drv/test/test3/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/test/test3/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = test3 Index: uspace/drv/time/cmos-rtc/Makefile =================================================================== --- uspace/drv/time/cmos-rtc/Makefile (revision d0cbfd394fe9314c00a4d50969d60a32db04ac8a) +++ uspace/drv/time/cmos-rtc/Makefile (revision cecba66ea48d60cfa59865e98aeda663808e42c7) @@ -28,6 +28,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +LIBS = drv BINARY = cmos-rtc