Changeset cecba66e in mainline for uspace/drv


Ignore:
Timestamp:
2017-11-08T00:39:43Z (8 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6d15572
Parents:
c631734
Message:

Instead of using library paths directly, refer to libraries by name and let the build script take care of compiler arguments.

Location:
uspace/drv
Files:
47 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/audio/hdaudio/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBPCM_PREFIX)/include
     30LIBS = drv pcm
    3231BINARY = hdaudio
    3332
  • uspace/drv/audio/sb16/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBDRV_PREFIX)/libdrv.a
    33 
    34 EXTRA_CFLAGS += \
    35         -I$(LIBDRV_PREFIX)/include -I$(LIBPCM_PREFIX)/include
     31LIBS = drv pcm
    3632
    3733BINARY = sb16
  • uspace/drv/block/ahci/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = ahci
    3332
  • uspace/drv/block/ata_bd/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
     30LIBS = drv scsi
    3231BINARY = ata_bd
    3332
  • uspace/drv/block/ddisk/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
     30LIBS = drv scsi
    3231BINARY = ddisk
    3332
  • uspace/drv/bus/adb/cuda_adb/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = cuda_adb
    3332
  • uspace/drv/bus/isa/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    32 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31LIBS = drv
    3332BINARY = isa
    3433
  • uspace/drv/bus/pci/pciintel/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = pciintel
    3332
  • uspace/drv/bus/usb/ehci/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv usbdev
    4332
    4433BINARY = ehci
  • uspace/drv/bus/usb/ohci/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv usbdev
    4332
    4433BINARY = ohci
  • uspace/drv/bus/usb/uhci/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv usbdev
    4332
    4433BINARY = uhci
  • uspace/drv/bus/usb/usbflbk/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a
    35 
    36 EXTRA_CFLAGS += \
    37         -I$(LIBUSB_PREFIX)/include \
    38         -I$(LIBUSBDEV_PREFIX)/include \
    39         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbdev usb drv
    4032
    4133BINARY = usbflbk
  • uspace/drv/bus/usb/usbhid/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHID_PREFIX)/libusbhid.a \
    33         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
     31LIBS = usbhid usbdev usb drv
    3632
    37 EXTRA_CFLAGS += \
    38         -I. \
    39         -I$(LIBUSB_PREFIX)/include \
    40         -I$(LIBUSBDEV_PREFIX)/include \
    41         -I$(LIBUSBHID_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     33EXTRA_CFLAGS += -I.
    4334
    4435BINARY = usbhid
  • uspace/drv/bus/usb/usbhub/Makefile

    rc631734 rcecba66e  
    3030USPACE_PREFIX = ../../../..
    3131
    32 LIBS = \
    33         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBDRV_PREFIX)/include
     32LIBS = usbdev usb drv
    4133
    4234BINARY = usbhub
  • uspace/drv/bus/usb/usbmast/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a \
    35         $(LIBSCSI_PREFIX)/libscsi.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBDRV_PREFIX)/include \
    41         -I$(LIBSCSI_PREFIX)/include
     31LIBS = usbdev usb drv scsi
    4232
    4333BINARY = usbmast
  • uspace/drv/bus/usb/usbmid/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a
    35 
    36 EXTRA_CFLAGS += \
    37         -I$(LIBUSB_PREFIX)/include \
    38         -I$(LIBUSBDEV_PREFIX)/include \
    39         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbdev usb drv
    4032
    4133BINARY = usbmid
  • uspace/drv/bus/usb/vhc/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    34         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    35         $(LIBUSB_PREFIX)/libusb.a \
    36         $(LIBDRV_PREFIX)/libdrv.a
     31LIBS = usbdev usbhost usbvirt usb drv
    3732
    38 EXTRA_CFLAGS += \
    39         -I$(LIBUSBVIRT_PREFIX)/include \
    40         -I$(LIBUSBDEV_PREFIX)/include \
    41         -I$(LIBUSBHOST_PREFIX)/include \
    42         -I$(LIBUSB_PREFIX)/include \
    43         -I$(LIBDRV_PREFIX)/include
    4433BINARY = vhc
    4534
  • uspace/drv/char/atkbd/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = atkbd
    3332
  • uspace/drv/char/i8042/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    32 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31LIBS = drv
    3332BINARY = i8042
    3433
  • uspace/drv/char/ns8250/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = ns8250
    3332
  • uspace/drv/char/pl050/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = pl050
    3332
  • uspace/drv/char/ps2mouse/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = ps2mouse
    3332
  • uspace/drv/char/xtkbd/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = xtkbd
    3332
  • uspace/drv/fb/amdm37x_dispc/Makefile

    rc631734 rcecba66e  
    3131USPACE_PREFIX = ../../..
    3232
    33 LIBS = \
    34         $(LIBDRV_PREFIX)/libdrv.a \
    35         $(LIBGRAPH_PREFIX)/libgraph.a \
    36         $(LIBSOFTREND_PREFIX)/libsoftrend.a
    37 
    38 EXTRA_CFLAGS += \
    39         -I$(LIBDRV_PREFIX)/include \
    40         -I$(LIBGRAPH_PREFIX) \
    41         -I$(LIBSOFTREND_PREFIX)
     33LIBS = drv graph softrend
    4234
    4335BINARY = amdm37x_dispc
  • uspace/drv/fb/kfb/Makefile

    rc631734 rcecba66e  
    3030
    3131USPACE_PREFIX = ../../..
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBGRAPH_PREFIX)/libgraph.a $(LIBSOFTREND_PREFIX)/libsoftrend.a
    33 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBGRAPH_PREFIX) -I$(LIBSOFTREND_PREFIX)
     32LIBS = drv graph softrend
    3433BINARY = kfb
    3534
  • uspace/drv/intctl/apic/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = apic
    3332
  • uspace/drv/intctl/i8259/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = i8259
    3332
  • uspace/drv/intctl/icp-ic/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = icp-ic
    3332
  • uspace/drv/intctl/obio/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    32 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31LIBS = drv
    3332BINARY = obio
    3433
  • uspace/drv/nic/ar9271/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a \
    35         $(LIBNIC_PREFIX)/libnic.a \
    36         $(LIBIEEE80211_PREFIX)/libieee80211.a \
    37         $(LIBCRYPTO_PREFIX)/libcrypto.a
     31LIBS = usbdev usb drv nic ieee80211 crypto
    3832
    39 EXTRA_CFLAGS += \
    40         -I. \
    41         -I$(LIBUSB_PREFIX)/include \
    42         -I$(LIBUSBDEV_PREFIX)/include \
    43         -I$(LIBDRV_PREFIX)/include \
    44         -I$(LIBNIC_PREFIX)/include \
    45         -I$(LIBIEEE80211_PREFIX)/include \
    46         -I$(LIBCRYPTO_PREFIX)
     33EXTRA_CFLAGS += -I.
    4734
    4835BINARY = ar9271
  • uspace/drv/nic/e1k/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include
     30LIBS = drv nic
    3231BINARY = e1k
    3332
  • uspace/drv/nic/ne2k/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include
     30LIBS = drv nic
    3231BINARY = ne2k
    3332
  • uspace/drv/nic/rtl8139/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include
     30LIBS = drv nic
    3231BINARY = rtl8139
    3332
  • uspace/drv/nic/rtl8169/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a
    32 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include
     31LIBS = drv nic
    3332BINARY = rtl8169
    3433
  • uspace/drv/platform/amdm37x/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = amdm37x
    3332
  • uspace/drv/platform/icp/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = icp
    3332
  • uspace/drv/platform/mac/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = mac
    3332
  • uspace/drv/platform/malta/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = malta
    3332
  • uspace/drv/platform/msim/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = msim
    3332
  • uspace/drv/platform/pc/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = pc
    3332
  • uspace/drv/platform/sun4u/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = sun4u
    3332
  • uspace/drv/root/root/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = root
    3332
  • uspace/drv/root/virt/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = virt
    3332
  • uspace/drv/test/test1/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = test1
    3332
  • uspace/drv/test/test2/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = test2
    3332
  • uspace/drv/test/test3/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = test3
    3332
  • uspace/drv/time/cmos-rtc/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = cmos-rtc
    3332
Note: See TracChangeset for help on using the changeset viewer.