Changeset cecba66e in mainline for uspace/app


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/app
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/barber/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBCOMPRESS_PREFIX)/libcompress.a \
    35         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    36         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    37 
    38 EXTRA_CFLAGS += \
    39         -I$(LIBGUI_PREFIX) \
    40         -I$(LIBDRAW_PREFIX) \
    41         -I$(LIBSOFTREND_PREFIX)
     31# TODO: Should be just "gui", rest is transitive dependencies.
     32LIBS = gui draw compress softrend
    4233
    4334BINARY = barber

  • uspace/app/bdsh/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBCLUI_PREFIX)/libclui.a $(LIBFMTUTIL_PREFIX)/libfmtutil.a
    32 EXTRA_CFLAGS = -I$(LIBCLUI_PREFIX) -I$(LIBFMTUTIL_PREFIX) \
    33         -I. -Icmds/ -Icmds/builtins -Icmds/modules
     31LIBS = clui fmtutil
     32EXTRA_CFLAGS = -I. -Icmds/ -Icmds/builtins -Icmds/modules
    3433BINARY = bdsh
    3534

  • uspace/app/bithenge/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBBITHENGE_PREFIX)/libbithenge.a $(LIBBLOCK_PREFIX)/libblock.a
    31 EXTRA_CFLAGS = -I$(LIBBITHENGE_PREFIX)/include -D__HELENOS__
     30# TODO: Should be just "bithenge", rest is transitive linker dependencies.
     31LIBS = bithenge block
     32EXTRA_CFLAGS = -D__HELENOS__
    3233BINARY = bithenge
    3334

  • uspace/app/blkdump/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBSCSI_PREFIX)/include
     31LIBS = block scsi
    3332BINARY = blkdump
    3433

  • uspace/app/dltest/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -I$(LIBDLTEST_PREFIX) -DDLTEST_LINKED
    31 LIBS = $(LIBDLTEST_PREFIX)/libdltest.so.0.0
     30EXTRA_CFLAGS = -DDLTEST_LINKED
     31LIBS = dltest
    3232# Need a dynamic link, but possibly still use static libc
    3333LINK_DYNAMIC = y

  • uspace/app/download/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBHTTP_PREFIX)/libhttp.a $(LIBURI_PREFIX)/liburi.a
    31 EXTRA_CFLAGS = -I$(LIBHTTP_PREFIX)/include -I$(LIBURI_PREFIX)
     30LIBS = http uri
    3231DEFS = -DRELEASE=$(RELEASE)
    3332BINARY = download

  • uspace/app/fdisk/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = \
    31         $(LIBCLUI_PREFIX)/libclui.a \
    32         $(LIBFDISK_PREFIX)/libfdisk.a
    33 
    34 EXTRA_CFLAGS = \
    35         -I$(LIBCLUI_PREFIX) \
    36         -I$(LIBFDISK_PREFIX)/include
     30LIBS = clui fdisk
    3731
    3832BINARY = fdisk

  • uspace/app/fontviewer/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    35         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBGUI_PREFIX) \
    39         -I$(LIBDRAW_PREFIX) \
    40         -I$(LIBSOFTREND_PREFIX)
     31# TODO: Should be just "gui", rest is transitive dependencies.
     32LIBS = gui draw softrend compress
    4133
    4234BINARY = fontviewer

  • uspace/app/gunzip/Makefile

    rc631734 rcecba66e  
    3030BINARY = gunzip
    3131
    32 EXTRA_CFLAGS += -I$(LIBCOMPRESS_PREFIX)
    33 LIBS = $(LIBCOMPRESS_PREFIX)/libcompress.a
     32LIBS = compress
    3433
    3534SOURCES = \

  • uspace/app/kio/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBCLUI_PREFIX)/libclui.a
    32 EXTRA_CFLAGS = -I$(LIBCLUI_PREFIX)
     31LIBS = clui
    3332BINARY = kio
    3433

  • uspace/app/mixerctl/Makefile

    rc631734 rcecba66e  
    3030BINARY = mixerctl
    3131
    32 LIBS = \
    33         $(LIBDRV_PREFIX)/libdrv.a
    34 
    35 EXTRA_CFLAGS = \
    36         -I$(LIBDRV_PREFIX)/include
     32LIBS = drv
    3733
    3834SOURCES = \

  • uspace/app/mkbd/Makefile

    rc631734 rcecba66e  
    3030BINARY = mkbd
    3131
    32 LIBS = \
    33         $(LIBUSBHID_PREFIX)/libusbhid.a \
    34         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    35         $(LIBUSB_PREFIX)/libusb.a \
    36         $(LIBDRV_PREFIX)/libdrv.a
    37 
    38 EXTRA_CFLAGS = \
    39         -I$(LIBUSB_PREFIX)/include \
    40         -I$(LIBUSBDEV_PREFIX)/include \
    41         -I$(LIBDRV_PREFIX)/include \
    42         -I$(LIBUSBHID_PREFIX)/include
     32LIBS = usb usbdev usbhid drv
    4333
    4434SOURCES = \

  • uspace/app/mkexfat/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
     30LIBS = block
    3231BINARY = mkexfat
    3332

  • uspace/app/mkfat/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
     31LIBS = block
    3332BINARY = mkfat
    3433

  • uspace/app/mkmfs/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBMINIX_PREFIX)
     31LIBS = block minix
    3332BINARY = mkmfs
    3433

  • uspace/app/modplay/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = \
    31         $(LIBTRACKMOD_PREFIX)/libtrackmod.a \
    32         $(LIBHOUND_PREFIX)/libhound.a \
    33         $(LIBPCM_PREFIX)/libpcm.a
    34 
    35 EXTRA_CFLAGS = \
    36         -I$(LIBTRACKMOD_PREFIX) \
    37         -I$(LIBHOUND_PREFIX)/include \
    38         -I$(LIBPCM_PREFIX)/include
     30LIBS = trackmod hound pcm
    3931
    4032BINARY = modplay

  • uspace/app/nic/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030BINARY = nic
    31 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
     31LIBS = drv
    3332
    3433SOURCES = \

  • uspace/app/sbi/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBCLUI_PREFIX)/libclui.a
    31 EXTRA_CFLAGS = -D__HELENOS__ -I$(LIBCLUI_PREFIX)
     30LIBS = clui
     31EXTRA_CFLAGS = -D__HELENOS__
    3232
    3333BINARY = sbi

  • uspace/app/sportdmp/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = sportdmp
    3332

  • uspace/app/sysinst/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = \
    31     $(LIBBLOCK_PREFIX)/libblock.a \
    32     $(LIBFDISK_PREFIX)/libfdisk.a \
    33 
    34 EXTRA_CFLAGS = \
    35     -I$(LIBBLOCK_PREFIX) \
    36     -I$(LIBFDISK_PREFIX)/include \
    37     -Iinclude
     30LIBS = block fdisk
    3831
    3932BINARY = sysinst

  • uspace/app/tester/Makefile

    rc631734 rcecba66e  
    3030USPACE_PREFIX = ../..
    3131
    32 LIBS = \
    33         $(LIBBLOCK_PREFIX)/libblock.a \
    34         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS = \
    38         -I$(LIBBLOCK_PREFIX) \
    39         -I$(LIBSOFTFLOAT_PREFIX) \
    40         -I$(LIBDRV_PREFIX)/include
     32# TODO: softfloat testing should be done via unit tests.
     33LIBS = block softfloat drv
     34EXTRA_CFLAGS = -I$(LIBSOFTFLOAT_PREFIX)
    4135
    4236BINARY = tester

  • uspace/app/usbinfo/Makefile

    rc631734 rcecba66e  
    3030BINARY = usbinfo
    3131
    32 LIBS = \
    33         $(LIBUSBHID_PREFIX)/libusbhid.a \
    34         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    35         $(LIBUSB_PREFIX)/libusb.a \
    36         $(LIBDRV_PREFIX)/libdrv.a
    37 EXTRA_CFLAGS = \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHID_PREFIX)/include \
    41         -I$(LIBDRV_PREFIX)/include
     32LIBS = usb usbhid usbdev drv
    4233
    4334SOURCES = \

  • uspace/app/vcalc/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    35         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBGUI_PREFIX) \
    39         -I$(LIBDRAW_PREFIX) \
    40         -I$(LIBSOFTREND_PREFIX)
     31# TODO: Should be just "gui", rest is transitive dependencies.
     32LIBS = gui draw softrend compress
    4133
    4234BINARY = vcalc

  • uspace/app/vdemo/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    35         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBGUI_PREFIX) \
    39         -I$(LIBDRAW_PREFIX) \
    40         -I$(LIBSOFTREND_PREFIX)
     31# TODO: Should be just "gui", rest is transitive dependencies.
     32LIBS = gui draw softrend compress
    4133
    4234BINARY = vdemo

  • uspace/app/viewer/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    35         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBGUI_PREFIX) \
    39         -I$(LIBDRAW_PREFIX) \
    40         -I$(LIBSOFTREND_PREFIX)
     31# TODO: Should be just "gui", rest is transitive dependencies.
     32LIBS = gui draw softrend compress
    4133
    4234BINARY = viewer

  • uspace/app/vlaunch/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    35         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBGUI_PREFIX) \
    39         -I$(LIBDRAW_PREFIX) \
    40         -I$(LIBSOFTREND_PREFIX)
     31# TODO: Should be just "gui", rest is transitive dependencies.
     32LIBS = gui draw softrend compress
    4133
    4234BINARY = vlaunch

  • uspace/app/vterm/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBGUI_PREFIX)/libgui.a \
    33         $(LIBDRAW_PREFIX)/libdraw.a \
    34         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    35         $(LIBGRAPH_PREFIX)/libgraph.a \
    36         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    37 
    38 EXTRA_CFLAGS += \
    39         -I$(LIBGUI_PREFIX) \
    40         -I$(LIBDRAW_PREFIX) \
    41         -I$(LIBSOFTREND_PREFIX) \
    42         -I$(LIBGRAPH_PREFIX)
     31# TODO: Should be just "gui graph", rest is transitive dependencies.
     32LIBS = gui graph draw softrend compress
    4333
    4434BINARY = vterm

  • uspace/app/vuhid/Makefile

    rc631734 rcecba66e  
    3232BINARY = vuh
    3333
    34 LIBS = \
    35         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    36         $(LIBUSBHID_PREFIX)/libusbhid.a \
    37         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    38         $(LIBUSB_PREFIX)/libusb.a \
    39         $(LIBDRV_PREFIX)/libdrv.a
    40 EXTRA_CFLAGS = \
    41         -I$(LIBUSB_PREFIX)/include \
    42         -I$(LIBUSBDEV_PREFIX)/include \
    43         -I$(LIBUSBHID_PREFIX)/include \
    44         -I$(LIBUSBVIRT_PREFIX)/include \
    45         -I$(LIBDRV_PREFIX)/include
    46 
     34LIBS = usb usbdev usbhid usbvirt drv
    4735
    4836SOURCES_INTERFACES = \

  • uspace/app/wavplay/Makefile

    rc631734 rcecba66e  
    3030BINARY = wavplay
    3131
    32 LIBS = \
    33         $(LIBHOUND_PREFIX)/libhound.a \
    34         $(LIBDRV_PREFIX)/libdrv.a \
    35         $(LIBPCM_PREFIX)/libpcm.a
    36 
    37 EXTRA_CFLAGS = \
    38         -I$(LIBDRV_PREFIX)/include \
    39         -I$(LIBHOUND_PREFIX)/include \
    40         -I$(LIBPCM_PREFIX)/include
     32LIBS = drv hound pcm
    4133
    4234SOURCES = \

  • uspace/app/wifi_supplicant/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030BINARY = wifi_supplicant
    31 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
     31LIBS = drv
    3332
    3433SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.