Changeset cecba66e in mainline for uspace/srv


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/srv
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/audio/hound/Makefile

    rc631734 rcecba66e  
    3030BINARY = hound
    3131
    32 EXTRA_CFLAGS = \
    33         -DNAME="\"hound\"" \
    34         -I$(LIBDRV_PREFIX)/include \
    35         -I$(LIBHOUND_PREFIX)/include \
    36         -I$(LIBPCM_PREFIX)/include
     32EXTRA_CFLAGS = -DNAME="\"hound\""
    3733
    38 LIBS = \
    39         $(LIBDRV_PREFIX)/libdrv.a \
    40         $(LIBHOUND_PREFIX)/libhound.a \
    41         $(LIBPCM_PREFIX)/libpcm.a
     34LIBS = drv hound pcm
    4235
    4336SOURCES = \

  • uspace/srv/bd/sata_bd/Makefile

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

  • uspace/srv/bd/vbd/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBLABEL_PREFIX)/liblabel.a \
    33         $(LIBBLOCK_PREFIX)/libblock.a
    34 
    35 EXTRA_CFLAGS = \
    36         -I$(LIBLABEL_PREFIX)/include \
    37         -I$(LIBBLOCK_PREFIX)
     31LIBS = label block
    3832
    3933BINARY = vbd

  • uspace/srv/fs/cdfs/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    31 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) \
    32     -I$(LIBSCSI_PREFIX)/include
     30LIBS = block fs scsi
    3331BINARY = cdfs
    3432

  • uspace/srv/fs/exfat/Makefile

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

  • uspace/srv/fs/ext4fs/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = \
    31     $(LIBEXT4_PREFIX)/libext4.a \
    32     $(LIBBLOCK_PREFIX)/libblock.a \
    33     $(LIBFS_PREFIX)/libfs.a \
    34     $(LIBCRYPTO_PREFIX)/libcrypto.a
    35 
    36 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX)/include -I$(LIBCRYPTO_PREFIX)
     30LIBS = ext4 block fs crypto
    3731BINARY = ext4fs
    3832STATIC_NEEDED = y

  • uspace/srv/fs/fat/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    32 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
     31LIBS = block fs
    3332BINARY = fat
    3433STATIC_NEEDED = y

  • uspace/srv/fs/locfs/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBFS_PREFIX)/libfs.a
    32 EXTRA_CFLAGS += -I$(LIBFS_PREFIX)
     31LIBS = fs
    3332BINARY = locfs
    3433

  • uspace/srv/fs/mfs/Makefile

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

  • uspace/srv/fs/tmpfs/Makefile

    rc631734 rcecba66e  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    32 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
     31LIBS = block fs
    3332BINARY = tmpfs
    3433STATIC_NEEDED = y

  • uspace/srv/fs/udf/Makefile

    rc631734 rcecba66e  
    3030
    3131USPACE_PREFIX = ../../..
    32 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    33 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
     32LIBS = block fs
    3433BINARY = udf
    3534

  • uspace/srv/hid/compositor/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBDRAW_PREFIX)/libdraw.a \
    33         $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    34         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBDRAW_PREFIX) \
    39         -I$(LIBSOFTREND_PREFIX) \
    40         -I$(LIBDRV_PREFIX)/include
     31LIBS = draw softrend drv compress
    4132
    4233BINARY = compositor

  • uspace/srv/hid/input/Makefile

    rc631734 rcecba66e  
    3030USPACE_PREFIX = ../../..
    3131BINARY = input
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    33 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     32LIBS = drv
    3433
    3534SOURCES = \

  • uspace/srv/hid/isdv4_tablet/Makefile

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

  • uspace/srv/hid/output/Makefile

    rc631734 rcecba66e  
    3030USPACE_PREFIX = ../../..
    3131BINARY = output
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    33 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     32LIBS = drv
    3433
    3534SOURCES = \

  • uspace/srv/hid/rfb/Makefile

    rc631734 rcecba66e  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBGRAPH_PREFIX)/libgraph.a
    31 EXTRA_CFLAGS = -I$(LIBGRAPH_PREFIX)
     30LIBS = graph
    3231BINARY = rfb
    3332

  • uspace/srv/net/ethip/Makefile

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

  • uspace/srv/net/slip/Makefile

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

  • uspace/srv/net/tcp/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBNETTL_PREFIX)/libnettl.a
    33 
    34 EXTRA_CFLAGS += \
    35         -I$(LIBNETTL_PREFIX)/include
     31LIBS = nettl
    3632
    3733BINARY = tcp

  • uspace/srv/net/udp/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBNETTL_PREFIX)/libnettl.a
    33 
    34 EXTRA_CFLAGS += \
    35         -I$(LIBNETTL_PREFIX)/include
     31LIBS = nettl
    3632
    3733BINARY = udp

  • uspace/srv/volsrv/Makefile

    rc631734 rcecba66e  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = \
    32         $(LIBLABEL_PREFIX)/liblabel.a \
    33         $(LIBBLOCK_PREFIX)/libblock.a
    34 
    35 EXTRA_CFLAGS = \
    36         -I$(LIBLABEL_PREFIX)/include \
    37         -I$(LIBBLOCK_PREFIX)
     31LIBS = label block
    3832
    3933BINARY = volsrv
Note: See TracChangeset for help on using the changeset viewer.