Changes in uspace/Makefile.common [b92a0ee:d9be488] in mainline

File:

• uspace/Makefile.common (modified) (10 diffs)

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
+#   MATH               set to 'y' to use the math library
 #   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
 #
@@ -86 +87 @@
 endif
 
-ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
         ifneq ($(SLIBRARY),)
                 LARCHIVE = $(LIBRARY).la
@@ -110 +111 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
+LIBMATH_PREFIX = $(LIB_PREFIX)/math
+LIBMATH_INCLUDES_FLAGS = \
+        -I$(LIBMATH_PREFIX)/include \
+        -I$(LIBMATH_PREFIX)/arch/$(UARCH)/include
+
 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
 
@@ -131 +137 @@
 
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
+LIBHOUND_PREFIX = $(LIB_PREFIX)/hound
+LIBPCM_PREFIX = $(LIB_PREFIX)/pcm
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
@@ -139 +147 @@
 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
 
+LIBHTTP_PREFIX = $(LIB_PREFIX)/http
+LIBURI_PREFIX = $(LIB_PREFIX)/uri
+
+LIBMBR_PREFIX = $(LIB_PREFIX)/mbr
+LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
+
 ifeq ($(STATIC_NEEDED),y)
         STATIC_BUILD = y
@@ -145 +159 @@
                 STATIC_BUILD = y
         else
-                ifeq ($(CONFIG_USE_SHARED_LIBS), y)
+                ifeq ($(CONFIG_USE_SHARED_LIBS),y)
                         STATIC_BUILD = n
                 else
@@ -162 +176 @@
         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
         LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+        ifeq ($(MATH),y)
+                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
+        endif
 else
         BASE_LIBS = $(LIBC_PREFIX)/libc.so0 $(LIBSOFTINT_PREFIX)/libsofti.so0
         LFLAGS = -Bdynamic
         LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+        ifeq ($(MATH),y)
+                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so0
+        endif
+endif
+
+ifeq ($(MATH),y)
+        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS)
+else
+        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
 endif
 
@@ -184 +210 @@
         find . -name '*.lo' -follow -exec rm \{\} \;
 
-GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
         -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -g -D__$(ENDIANESS)__
-
-ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -pipe -ggdb -D__$(ENDIANESS)__
+
+ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -222 +248 @@
 endif
 
+# Prepare for POSIX before including platform specific stuff
+ifeq ($(POSIX_COMPAT),y)
+        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix -I$(LIBPOSIX_PREFIX)/include/
+        BASE_LIBS = $(LIBPOSIX_PREFIX)/libposixaslibc.a $(LIBPOSIX_PREFIX)/libc4posix.a $(LIBSOFTINT_PREFIX)/libsoftint.a
+endif
+
 ## Setup platform configuration
 #
@@ -232 +264 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
-ifeq ($(POSIX_COMPAT),y)
-        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
-        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
-endif
-
 ifeq ($(COMPILER),gcc_cross)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
+ifeq ($(COMPILER),gcc_helenos)
         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)