Changes in uspace/Makefile.common [9234566:ea6c838] in mainline

File:

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

uspace/Makefile.common

@@ -110 +110 @@
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
+LIBFB_PREFIX = $(LIB_PREFIX)/fb
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
 
-LIBGRAPH_PREFIX = $(LIB_PREFIX)/graph
-LIBSOFTREND_PREFIX = $(LIB_PREFIX)/softrend
-LIBDRAW_PREFIX = $(LIB_PREFIX)/draw
-LIBGUI_PREFIX = $(LIB_PREFIX)/gui
-
-LIBEXT4_PREFIX = $(LIB_PREFIX)/ext4
+LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
 
 LIBUSB_PREFIX = $(LIB_PREFIX)/usb
@@ -127 +123 @@
 
 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
@@ -132 +130 @@
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
-
-LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
 
 ifeq ($(STATIC_NEEDED),y)
@@ -226 +222 @@
 
 ifeq ($(POSIX_COMPAT),y)
-        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
+        CFLAGS = -I$(LIBPOSIX_PREFIX)
         LIBS += $(LIBPOSIX_PREFIX)/libposix.a
 endif
@@ -256 +252 @@
 
 ifneq ($(BINARY),)
-%.disasm: $(BINARY)
+%.disasm: $(BINARY)_prestrip
 ifeq ($(CONFIG_LINE_DEBUG),y)
         $(OBJDUMP) -d -S $< > $@
@@ -263 +259 @@
 endif
 
-$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+.INTERMEDIATE: $(BINARY)_prestrip
+
+$(BINARY)_prestrip: $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $@ $(OBJECTS) $(LIBS) $(BASE_LIBS)
+
+$(BINARY): $(BINARY)_prestrip $(BINARY).disasm
+        cp $(BINARY)_prestrip $@
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)