Changeset 5e718d9 in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2012-08-21T10:04:16Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
67edca6
Parents:
0da6c04 (diff), 6a97f2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with upstream (lp:~wtachi/helenos/bithenge)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r0da6c04 r5e718d9  
    110110LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    111111LIBFS_PREFIX = $(LIB_PREFIX)/fs
    112 LIBFB_PREFIX = $(LIB_PREFIX)/fb
    113112LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    114113LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
    115114
     115LIBGRAPH_PREFIX = $(LIB_PREFIX)/graph
     116LIBSOFTREND_PREFIX = $(LIB_PREFIX)/softrend
     117LIBDRAW_PREFIX = $(LIB_PREFIX)/draw
     118LIBGUI_PREFIX = $(LIB_PREFIX)/gui
     119
    116120LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
     121LIBEXT4_PREFIX = $(LIB_PREFIX)/ext4
    117122
    118123LIBUSB_PREFIX = $(LIB_PREFIX)/usb
    … …  
    128133
    129134LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
     135
     136LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
    130137
    131138ifeq ($(STATIC_NEEDED),y)
    … …  
    283290
    284291ifneq ($(LIBRARY),)
    285 %.a: $(OBJECTS)
     292$(LIBRARY).a: $(OBJECTS)
    286293        $(AR) rc $@ $(OBJECTS)
    287294endif
    288295
    289296ifneq ($(SLIBRARY),)
    290 %.la: $(LOBJECTS)
     297$(LIBRARY).la: $(LOBJECTS)
    291298        $(AR) rc $@ $(LOBJECTS)
    292299endif
Note: See TracChangeset for help on using the changeset viewer.