Changeset c631734 in mainline for kernel/Makefile

Timestamp:

2017-11-07T23:14:00Z (6 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cecba66e

Parents:

b8d4af4b

Message:

Mostly cleanup in uspace/Makefile.common.

• Pass -MP in addition to -MD (also in boot and kernel).
• Derive SLIBRARY and LSONAME from LIBRARY and (new)SOVERSION.
• Removed include of version "makefile", which was unused.
• Replaced OUTPUT and LOUTPUT with plural OUTPUTS, updated rules to match.
• Moved things around so that first rule is after last variable assignment.
• Removed '-n'(undesirable) and '-M'(redundant) from linker options.
• Removed redundant rules at the tail of the file. GNU make bug #26893 seems to have been fixed years ago, and I can't reproduce any problem.

File:

• kernel/Makefile (modified) (1 diff)

kernel/Makefile

@@ -414 +414 @@
 
 %.o: %.S | depend
-        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.s | depend
-        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
 
 $(REAL_MAP).o: $(REAL_MAP).bin