Changes in uspace/Makefile.common [3c664d6:664af708] in mainline

File:

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

uspace/Makefile.common

@@ -86 +86 @@
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 
-LIBPCI_PREFIX = $(LIB_PREFIX)/pci
-
-LIBSOCKET_PREFIX = $(LIB_PREFIX)/socket
+LIBDRV_PREFIX = $(LIB_PREFIX)/drv
+LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 
@@ -136 +135 @@
 endif
 
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        GCC_CFLAGS += -g
+        ICC_CFLAGS += -g
+        SUNCC_CFLAGS += -g
+        CLANG_CFLAGS += -g
+endif
+
 ## Setup platform configuration
 #
@@ -172 +178 @@
 ifneq ($(BINARY),)
 %.disasm: $(BINARY)
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        $(OBJDUMP) -d -S $< > $@
+else
         $(OBJDUMP) -d $< > $@
+endif
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
@@ -207 +217 @@
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
+
+##
+# This explicit dependecy of the output binary on the object files seems to be
+# necessary to prevent parallel build failures (GNU make bug #26893 ???).
+$(OUTPUT): $(OBJECTS)
+