Changes in / [4a9728ec:ab92305] in mainline

Files:

• boot/grub.pc/stage2_eltorito (deleted)
• uspace/Makefile.common (modified) (2 diffs)
• uspace/srv/net/tcp/tcp_header.h (deleted)

uspace/Makefile.common

@@ -267 +267 @@
 
 ifneq ($(BINARY),)
-%.disasm: $(BINARY)_prestrip
+%.disasm: $(BINARY)
 ifeq ($(CONFIG_LINE_DEBUG),y)
         $(OBJDUMP) -d -S $< > $@
@@ -274 +274 @@
 endif
 
-.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 $@
+$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)