Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset cecba66e in mainline


Ignore:
Timestamp:
2017-11-08T00:39:43Z (3 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
master
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.

Files:
2 added
122 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    rc631734 rcecba66e  
    66*.so.*
    77*.d
     8tag
    89Makefile.ag.depend
    910Makefile.common
  • uspace/Makefile

    rc631734 rcecba66e  
    222222        lib/label \
    223223        lib/math \
     224        lib/minix \
    224225        lib/nettl \
    225226        lib/nic \
     
    256257        find lib app drv srv -name '*.lo' -follow -exec rm \{\} \;
    257258        find lib app drv srv -name '*.d' -follow -exec rm \{\} \;
     259        find lib app drv srv -name 'tag' -follow -exec rm \{\} \;
    258260
    259261$(CLEANS):
  • uspace/Makefile.common

    rc631734 rcecba66e  
    112112
    113113LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    114 
    115 LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto
    116 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    117 LIBFDISK_PREFIX = $(LIB_PREFIX)/fdisk
    118 LIBLABEL_PREFIX = $(LIB_PREFIX)/label
    119 LIBFS_PREFIX = $(LIB_PREFIX)/fs
    120 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    121 LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
    122 
    123 LIBGRAPH_PREFIX = $(LIB_PREFIX)/graph
    124 LIBSOFTREND_PREFIX = $(LIB_PREFIX)/softrend
    125 LIBDRAW_PREFIX = $(LIB_PREFIX)/draw
    126 LIBGUI_PREFIX = $(LIB_PREFIX)/gui
    127 
    128 LIBEXT4_PREFIX = $(LIB_PREFIX)/ext4
    129 
    130 LIBUSB_PREFIX = $(LIB_PREFIX)/usb
    131 LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost
    132 LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev
    133 LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid
    134 LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
    135 
    136 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    137 LIBHOUND_PREFIX = $(LIB_PREFIX)/hound
    138 LIBPCM_PREFIX = $(LIB_PREFIX)/pcm
    139 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
    140 LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211
    141 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
    142 LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress
    143114LIBDLTEST_PREFIX = $(LIB_PREFIX)/dltest
    144 
    145 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
    146 LIBTRACKMOD_PREFIX = $(LIB_PREFIX)/trackmod
    147 
    148 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
    149 
    150 LIBHTTP_PREFIX = $(LIB_PREFIX)/http
    151 LIBURI_PREFIX = $(LIB_PREFIX)/uri
    152 
    153 LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
    154115
    155116AFLAGS =
     
    205166endif
    206167
     168ifneq ($(LIBRARY),)
     169        INCLUDES_FLAGS += -Iinclude -I.
     170endif
     171
     172INCLUDES_FLAGS += $(foreach lib,$(LIBS), -I$(LIB_PREFIX)/$(lib) -I$(LIB_PREFIX)/$(lib)/include)
     173
    207174# PCUT-based unit tests
    208175ifneq ($(TEST_SOURCES),)
     
    286253DEPENDS := $(addsuffix .d,$(basename $(SOURCES))) $(addsuffix .test.d,$(basename $(TEST_SOURCES)))
    287254
     255LIBTAGS := $(foreach lib,$(LIBS), $(USPACE_PREFIX)/lib/$(lib)/tag)
     256LIBARGS := $(addprefix -L$(USPACE_PREFIX)/lib/, $(LIBS)) $(addprefix -l, $(LIBS))
     257
    288258-include $(DEPENDS)
    289259
    290260.PHONY: all all-test clean depend
    291261
    292 all: $(OUTPUTS)
     262all: tag $(OUTPUTS)
    293263
    294264all-test: $(TEST_OUTPUTS)
     
    298268
    299269depend: $(PRE_DEPEND)
     270
     271# "Tag" files are used to force relink of binaries when dependencies get rebuilt,
     272# regardless of whether the dependency was linked statically or dynamically,
     273# or which version of a dynamic library was used. Prerequisites for this file
     274# are defined further down.
     275tag:
     276        touch tag
    300277
    301278%.disasm: %
     
    307284
    308285ifneq ($(BINARY),)
    309 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
    310         $(LD) $(LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(OBJECTS) $(LIBS) $(BASE_LIBS)
     286$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(BASE_LIBS)
     287        $(LD) $(LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
    311288endif
    312289
    313290ifneq ($(TEST_BINARY),)
    314 $(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS)
    315         $(LD) $(LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBS) $(BASE_LIBS)
     291$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) $(BASE_LIBS)
     292        $(LD) $(LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
    316293endif
    317294
    318295ifneq ($(LIBRARY),)
     296tag: $(LIBRARY).a
     297
    319298$(LIBRARY).a: $(OBJECTS)
    320299        $(AR) rc $@ $(OBJECTS)
     
    322301
    323302ifneq ($(SLIBRARY),)
     303tag: $(SLIBRARY)
     304
    324305$(LIBRARY).la: $(LOBJECTS)
    325306        $(AR) rc $@ $(LOBJECTS)
  • 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 = \
  • 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
  • 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 = \
  • 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.