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

Changeset 9d8b12da in mainline


Ignore:
Timestamp:
2017-11-08T22:43:39Z (4 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
lfn, master
Children:
378948d
Parents:
d2e7a51
Message:

Instead of setting MATH=y, just list 'math' in dependencies like a normal library.

Location:
uspace
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile.common

    rd2e7a51 r9d8b12da  
    4444#   EXTRA_CLEAN        additional cleanup targets
    4545#
    46 #   MATH               set to 'y' to use the math library
    4746#   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
    4847#
     
    140139ifeq ($(STATIC_BUILD),y)
    141140        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    142         ifeq ($(MATH),y)
    143                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
    144         endif
    145141else
    146142        BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
    147143        LINK_DYNAMIC = y
    148         ifeq ($(MATH),y)
    149                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so.0
    150         endif
    151144endif
    152145
     
    168161LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
    169162
    170 ifeq ($(MATH),y)
    171         INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS)
    172 else
    173         INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
    174 endif
     163INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
    175164
    176165ifneq ($(LIBRARY),)
     
    179168
    180169INCLUDES_FLAGS += $(foreach lib,$(LIBS), -I$(LIB_PREFIX)/$(lib) -I$(LIB_PREFIX)/$(lib)/include)
     170
     171# TODO: get rid of this special case
     172ifneq ($(filter math, $(LIBS)),)
     173        INCLUDES_FLAGS += $(LIBMATH_INCLUDES_FLAGS)
     174endif
    181175
    182176# PCUT-based unit tests
  • uspace/app/barber/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw compress softrend
     32LIBS = gui draw compress softrend math
    3333
    3434BINARY = barber
    35 MATH = y
    3635
    3736IMG = image
  • uspace/app/fontviewer/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress
     32LIBS = gui draw softrend compress math
    3333
    3434BINARY = fontviewer
    35 MATH = y
    3635
    3736SOURCES = \
  • uspace/app/tester/Makefile

    rd2e7a51 r9d8b12da  
    3131
    3232# TODO: softfloat testing should be done via unit tests.
    33 LIBS = block softfloat drv
     33LIBS = block softfloat drv math
    3434EXTRA_CFLAGS = -I$(LIBSOFTFLOAT_PREFIX)
    3535
    3636BINARY = tester
    37 MATH = y
    3837
    3938SOURCES = \
  • uspace/app/vcalc/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress
     32LIBS = gui draw softrend compress math
    3333
    3434BINARY = vcalc
    35 MATH = y
    3635
    3736SOURCES = \
  • uspace/app/vdemo/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress
     32LIBS = gui draw softrend compress math
    3333
    3434BINARY = vdemo
    35 MATH = y
    3635
    3736SOURCES = \
  • uspace/app/viewer/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress
     32LIBS = gui draw softrend compress math
    3333
    3434BINARY = viewer
    35 MATH = y
    3635
    3736SOURCES = \
  • uspace/app/vlaunch/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress
     32LIBS = gui draw softrend compress math
    3333
    3434BINARY = vlaunch
    35 MATH = y
    3635
    3736IMG = image
  • uspace/app/vterm/Makefile

    rd2e7a51 r9d8b12da  
    3030
    3131# TODO: Should be just "gui graph", rest is transitive dependencies.
    32 LIBS = gui graph draw softrend compress
     32LIBS = gui graph draw softrend compress math
    3333
    3434BINARY = vterm
    35 MATH = y
    3635
    3736SOURCES = \
  • uspace/lib/math/Makefile

    rd2e7a51 r9d8b12da  
    3434LIBRARY = libmath
    3535SOVERSION = 0.0
    36 MATH = y
     36
     37EXTRA_CFLAGS += -Iarch/$(UARCH)/include
    3738
    3839-include $(CONFIG_MAKEFILE)
  • uspace/lib/softfloat/Makefile

    rd2e7a51 r9d8b12da  
    3030USPACE_PREFIX = ../..
    3131LIBRARY = libsoftfloat
    32 MATH = y
     32EXTRA_CFLAGS += $(LIBMATH_INCLUDES_FLAGS)
    3333
    3434SOURCES = \
  • uspace/lib/softrend/Makefile

    rd2e7a51 r9d8b12da  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libsoftrend
    31 MATH = y
     31LIBS = math
    3232
    3333SOURCES = \
  • uspace/srv/hid/compositor/Makefile

    rd2e7a51 r9d8b12da  
    2929USPACE_PREFIX = ../../..
    3030
    31 LIBS = draw softrend drv compress
     31LIBS = draw softrend drv compress math
    3232
    3333BINARY = compositor
    34 MATH = y
    3534
    3635SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.