Changeset cecba66e in mainline for uspace/lib


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/lib
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/bithenge/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libbithenge
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -D__HELENOS__ -Iinclude
     31EXTRA_CFLAGS = -D__HELENOS__
     32LIBS = block
    3233
    3334SOURCES = \
  • uspace/lib/clui/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -I.
    3130LIBRARY = libclui
    3231
  • uspace/lib/draw/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libdraw
    31 EXTRA_CFLAGS += -I$(LIBSOFTREND_PREFIX) -I$(LIBCOMPRESS_PREFIX)
     31LIBS = softrend compress
    3232
    3333SOURCES = \
  • uspace/lib/drv/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../..
    31 EXTRA_CFLAGS = \
    32         -Iinclude \
    33         -Igeneric/private \
    34         -I$(LIBPCM_PREFIX)/include
     31EXTRA_CFLAGS = -Igeneric/private
    3532LIBRARY = libdrv
     33LIBS = pcm
    3634
    3735SOURCES = \
  • uspace/lib/ext4/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libext4
    31 EXTRA_CFLAGS = \
    32     -I$(LIBBLOCK_PREFIX) \
    33     -I$(LIBCRYPTO_PREFIX) \
    34     -I$(LIBFS_PREFIX) \
    35     -Iinclude
     31LIBS = block crypto fs
    3632
    3733SOURCES = \
  • uspace/lib/fdisk/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude
    3130
    3231LIBRARY = libfdisk
  • uspace/lib/fmtutil/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -I.
    3130LIBRARY = libfmtutil
    3231
  • uspace/lib/gui/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libgui
    31 EXTRA_CFLAGS += -I$(LIBDRAW_PREFIX) -I$(LIBSOFTREND_PREFIX) -I$(LIBGRAPH_PREFIX)
     31LIBS = draw softrend graph
    3232
    3333SOURCES = \
  • uspace/lib/hound/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude/hound -Iinclude -I$(LIBPCM_PREFIX)/include
     30EXTRA_CFLAGS = -Iinclude/hound
    3131LIBRARY = libhound
     32LIBS = pcm
    3233
    3334SOURCES = \
  • uspace/lib/ieee80211/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libieee80211
    31 
    32 EXTRA_CFLAGS += \
    33         -Iinclude \
    34         -I$(LIBDRV_PREFIX)/include \
    35         -I$(LIBNIC_PREFIX)/include \
    36         -I$(LIBCRYPTO_PREFIX)
     31LIBS = drv nic crypto
    3732
    3833SOURCES = \
  • uspace/lib/label/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude
    3130
    3231LIBRARY = liblabel
  • uspace/lib/nettl/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude
    3130LIBRARY = libnettl
    3231
  • uspace/lib/nic/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libnic
    31 EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
     31EXTRA_CFLAGS += -DLIBNIC_INTERNAL
     32LIBS = drv
    3233
    3334SOURCES = \
  • uspace/lib/pcm/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude/pcm -Iinclude
     30EXTRA_CFLAGS = -Iinclude/pcm
    3131LIBRARY = libpcm
    3232
  • uspace/lib/pcut/helenos.mak

    rc631734 rcecba66e  
    3737        src/report/xml.c \
    3838        src/run.c
    39 EXTRA_CFLAGS = -D__helenos__ -Iinclude
     39
     40EXTRA_CFLAGS = -D__helenos__
    4041LIBRARY = libpcut
  • uspace/lib/scsi/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude
    3130LIBRARY = libscsi
    3231
  • uspace/lib/usb/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libusb
    31 EXTRA_CFLAGS += \
    32         -I$(LIBDRV_PREFIX)/include \
    33         -Iinclude
     31LIBS = drv
    3432
    3533SOURCES = \
  • uspace/lib/usbdev/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libusbdev
    31 EXTRA_CFLAGS += \
    32         -I$(LIBUSB_PREFIX)/include \
    33         -I$(LIBDRV_PREFIX)/include \
    34         -Iinclude
     31LIBS = usb drv
    3532
    3633SOURCES = \
  • uspace/lib/usbhid/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libusbhid
    31 EXTRA_CFLAGS += \
    32         -I$(LIBUSB_PREFIX)/include \
    33         -I$(LIBUSBDEV_PREFIX)/include \
    34         -I$(LIBDRV_PREFIX)/include \
    35         -Iinclude
     31LIBS = usb usbdev drv
    3632
    3733SOURCES = \
  • uspace/lib/usbhost/Makefile

    rc631734 rcecba66e  
    3030LIBRARY = libusbhost
    3131EXTRA_CFLAGS += \
    32         -I$(LIBUSB_PREFIX)/include \
    33         -I$(LIBDRV_PREFIX)/include \
    34         -Iinclude/usb/host \
    35         -Iinclude
     32        -Iinclude/usb/host
     33LIBS = usb drv
    3634
    3735SOURCES = \
  • uspace/lib/usbvirt/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libusbvirt
    31 
    3231EXTRA_CFLAGS = \
    33         -I$(LIBDRV_PREFIX)/include \
    34         -I$(LIBUSB_PREFIX)/include \
    35         -I$(LIBUSBDEV_PREFIX)/include \
    36         -Iinclude \
    3732        -Iinclude/usbvirt
     33LIBS = drv usb usbdev
    3834
    3935SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.