Changeset c631734 in mainline for uspace/lib


Ignore:
Timestamp:
2017-11-07T23:14:00Z (8 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.
Location:
uspace/lib
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    rb8d4af4b rc631734  
    4343EXTRA_CLEAN = $(LINKER_SCRIPTS)
    4444LIBRARY = libc
    45 SLIBRARY = libc.so.0.0
    46 LSONAME = libc.so.0
     45SOVERSION = 0.0
    4746
    4847-include $(CONFIG_MAKEFILE)

  • uspace/lib/dltest/Makefile

    rb8d4af4b rc631734  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libdltest
    31 SLIBRARY = libdltest.so.0.0
    32 LSONAME = libdltest.so.0
     31SOVERSION = 0.0
    3332
    3433SOURCES = \

  • uspace/lib/math/Makefile

    rb8d4af4b rc631734  
    3333
    3434LIBRARY = libmath
    35 SLIBRARY = libmath.so.0.0
    36 LSONAME = libmath.so.0
     35SOVERSION = 0.0
    3736MATH = y
    3837

  • uspace/lib/pcut/Makefile

    rb8d4af4b rc631734  
    3535all-test: $(SELF_TESTS)
    3636
    37 test-libpcut-%: $(OUTPUT)
    38         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS)
     37test-libpcut-%: $(LIBRARY).a
     38        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
    3939

  • uspace/lib/pcut/update-from-master.sh

    rb8d4af4b rc631734  
    7979all-test: $(SELF_TESTS)
    8080
    81 test-libpcut-%: $(OUTPUT)
    82         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS)
     81test-libpcut-%: $(LIBRARY).a
     82        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
    8383
    8484EOF_MAKEFILE_TAIL

  • uspace/lib/softint/Makefile

    rb8d4af4b rc631734  
    3131EXTRA_CFLAGS = -Iinclude
    3232LIBRARY = libsoftint
    33 SLIBRARY = libsoftint.so.0.0
    34 LSONAME = libsoftint.so.0
     33SOVERSION = 0.0
    3534
    3635SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.