Changes in uspace/Makefile.common [58563585:2f9a8e8] in mainline

File:

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

uspace/Makefile.common

@@ -122 +122 @@
 LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
-LIBFDISK_PREFIX = $(LIB_PREFIX)/fdisk
-LIBLABEL_PREFIX = $(LIB_PREFIX)/label
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
@@ -148 +146 @@
 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
 LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress
-LIBDLTEST_PREFIX = $(LIB_PREFIX)/dltest
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
@@ -158 +155 @@
 LIBURI_PREFIX = $(LIB_PREFIX)/uri
 
+LIBMBR_PREFIX = $(LIB_PREFIX)/mbr
+LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
 LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
 
-AFLAGS = --fatal-warnings
-LFLAGS = --fatal-warnings
+LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
 
 ifeq ($(STATIC_NEEDED),y)
@@ -177 +175 @@
 endif
 
+# Build static whenever we use libusb because that library uses 
+# thread local variables
+ifneq ($(findstring usb, $(LIBS)),)
+        STATIC_BUILD = y
+endif
+
 ifeq ($(STATIC_BUILD),y)
         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.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
-        LINK_DYNAMIC = y
+        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.so.0
+                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so0
         endif
-endif
-
-ifeq ($(LINK_DYNAMIC),y)
-        LFLAGS += -Bdynamic
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
-else
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 endif
 
@@ -256 +255 @@
         -integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
 
-LIB_CFLAGS = $(CFLAGS) -fPIC
+LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
 LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
 
@@ -286 +285 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(FUTEX_UPGRADABLE),y)
+        CFLAGS += -I$(LIBURCU_PREFIX)/
+        LIBS += $(LIBURCU_PREFIX)/liburcu.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
         CFLAGS += $(GCC_CFLAGS)
@@ -311 +315 @@
 endif
 
-ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
-endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -353 +355 @@
 
 ifneq ($(LIBRARY),)
-$(LIBRARY).a: $(OBJECTS)
+%.a: $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
 endif
 
-ifneq ($(LARCHIVE),)
-$(LARCHIVE): $(LOBJECTS)
+ifneq ($(SLIBRARY),)
+%.la: $(LOBJECTS)
         $(AR) rc $@ $(LOBJECTS)
 endif