Changeset 5e718d9 in mainline for uspace/srv/hid/console/Makefile


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/srv/hid/console/Makefile

    r0da6c04 r5e718d9  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBFB_PREFIX)/libfb.a
    32 EXTRA_CFLAGS += -I$(LIBFB_PREFIX)
    3331BINARY = console
    3432
    3533SOURCES = \
    36         console.c \
    37         images.c
    38 
    39 IMAGES = \
    40         gfx/helenos.tga \
    41         gfx/nameic.tga \
    42         gfx/cons_data.tga \
    43         gfx/cons_dis.tga \
    44         gfx/cons_dis_sel.tga \
    45         gfx/cons_idle.tga \
    46         gfx/cons_sel.tga \
    47         gfx/cons_kernel.tga \
    48         gfx/anim_1.tga \
    49         gfx/anim_2.tga \
    50         gfx/anim_3.tga \
    51         gfx/anim_4.tga
    52 
    53 PRE_DEPEND = images.c images.h
    54 EXTRA_CLEAN = images.c images.h
     34        console.c
    5535
    5636include $(USPACE_PREFIX)/Makefile.common
    57 
    58 images.c images.h: $(IMAGES)
    59         $(ROOT_PATH)/tools/mkarray.py images CONSOLE_IMAGES $^
Note: See TracChangeset for help on using the changeset viewer.