Changeset 9d8b12da in mainline
- Timestamp:
- 2017-11-08T22:43:39Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 378948d
- Parents:
- d2e7a51
- Location:
- uspace
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
rd2e7a51 r9d8b12da 44 44 # EXTRA_CLEAN additional cleanup targets 45 45 # 46 # MATH set to 'y' to use the math library47 46 # POSIX_COMPAT set to 'y' to use POSIX compatibility layer 48 47 # … … 140 139 ifeq ($(STATIC_BUILD),y) 141 140 BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a 142 ifeq ($(MATH),y)143 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a144 endif145 141 else 146 142 BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0 147 143 LINK_DYNAMIC = y 148 ifeq ($(MATH),y)149 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so.0150 endif151 144 endif 152 145 … … 168 161 LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld 169 162 170 ifeq ($(MATH),y) 171 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS) 172 else 173 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) 174 endif 163 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) 175 164 176 165 ifneq ($(LIBRARY),) … … 179 168 180 169 INCLUDES_FLAGS += $(foreach lib,$(LIBS), -I$(LIB_PREFIX)/$(lib) -I$(LIB_PREFIX)/$(lib)/include) 170 171 # TODO: get rid of this special case 172 ifneq ($(filter math, $(LIBS)),) 173 INCLUDES_FLAGS += $(LIBMATH_INCLUDES_FLAGS) 174 endif 181 175 182 176 # PCUT-based unit tests -
uspace/app/barber/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui", rest is transitive dependencies. 32 LIBS = gui draw compress softrend 32 LIBS = gui draw compress softrend math 33 33 34 34 BINARY = barber 35 MATH = y36 35 37 36 IMG = image -
uspace/app/fontviewer/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui", rest is transitive dependencies. 32 LIBS = gui draw softrend compress 32 LIBS = gui draw softrend compress math 33 33 34 34 BINARY = fontviewer 35 MATH = y36 35 37 36 SOURCES = \ -
uspace/app/tester/Makefile
rd2e7a51 r9d8b12da 31 31 32 32 # TODO: softfloat testing should be done via unit tests. 33 LIBS = block softfloat drv 33 LIBS = block softfloat drv math 34 34 EXTRA_CFLAGS = -I$(LIBSOFTFLOAT_PREFIX) 35 35 36 36 BINARY = tester 37 MATH = y38 37 39 38 SOURCES = \ -
uspace/app/vcalc/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui", rest is transitive dependencies. 32 LIBS = gui draw softrend compress 32 LIBS = gui draw softrend compress math 33 33 34 34 BINARY = vcalc 35 MATH = y36 35 37 36 SOURCES = \ -
uspace/app/vdemo/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui", rest is transitive dependencies. 32 LIBS = gui draw softrend compress 32 LIBS = gui draw softrend compress math 33 33 34 34 BINARY = vdemo 35 MATH = y36 35 37 36 SOURCES = \ -
uspace/app/viewer/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui", rest is transitive dependencies. 32 LIBS = gui draw softrend compress 32 LIBS = gui draw softrend compress math 33 33 34 34 BINARY = viewer 35 MATH = y36 35 37 36 SOURCES = \ -
uspace/app/vlaunch/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui", rest is transitive dependencies. 32 LIBS = gui draw softrend compress 32 LIBS = gui draw softrend compress math 33 33 34 34 BINARY = vlaunch 35 MATH = y36 35 37 36 IMG = image -
uspace/app/vterm/Makefile
rd2e7a51 r9d8b12da 30 30 31 31 # TODO: Should be just "gui graph", rest is transitive dependencies. 32 LIBS = gui graph draw softrend compress 32 LIBS = gui graph draw softrend compress math 33 33 34 34 BINARY = vterm 35 MATH = y36 35 37 36 SOURCES = \ -
uspace/lib/math/Makefile
rd2e7a51 r9d8b12da 34 34 LIBRARY = libmath 35 35 SOVERSION = 0.0 36 MATH = y 36 37 EXTRA_CFLAGS += -Iarch/$(UARCH)/include 37 38 38 39 -include $(CONFIG_MAKEFILE) -
uspace/lib/softfloat/Makefile
rd2e7a51 r9d8b12da 30 30 USPACE_PREFIX = ../.. 31 31 LIBRARY = libsoftfloat 32 MATH = y 32 EXTRA_CFLAGS += $(LIBMATH_INCLUDES_FLAGS) 33 33 34 34 SOURCES = \ -
uspace/lib/softrend/Makefile
rd2e7a51 r9d8b12da 29 29 USPACE_PREFIX = ../.. 30 30 LIBRARY = libsoftrend 31 MATH = y 31 LIBS = math 32 32 33 33 SOURCES = \ -
uspace/srv/hid/compositor/Makefile
rd2e7a51 r9d8b12da 29 29 USPACE_PREFIX = ../../.. 30 30 31 LIBS = draw softrend drv compress 31 LIBS = draw softrend drv compress math 32 32 33 33 BINARY = compositor 34 MATH = y35 34 36 35 SOURCES = \
Note:
See TracChangeset
for help on using the changeset viewer.