Changeset 6a97f2e in mainline


Ignore:
Timestamp:
2012-08-20T21:33:29Z (12 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5e718d9
Parents:
7eaeec1
Message:

uspace/Makefile.common: only generate the intended library

Because libbithenge used libblock.a, Makefile.common was trying to generate
libblock.a from the libbithenge object files. On the other hand, libbithenge
actually doesn't need libblock.a until it's linked into an executable.

Location:
uspace
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r7eaeec1 r6a97f2e  
    290290
    291291ifneq ($(LIBRARY),)
    292 %.a: $(OBJECTS)
     292$(LIBRARY).a: $(OBJECTS)
    293293        $(AR) rc $@ $(OBJECTS)
    294294endif
    295295
    296296ifneq ($(SLIBRARY),)
    297 %.la: $(LOBJECTS)
     297$(LIBRARY).la: $(LOBJECTS)
    298298        $(AR) rc $@ $(LOBJECTS)
    299299endif

  • uspace/lib/bithenge/Makefile

    r7eaeec1 r6a97f2e  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libbithenge
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3231EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -D__HELENOS__
    3332
Note: See TracChangeset for help on using the changeset viewer.