Changeset 925a21e in mainline for uspace/srv/hid/console/Makefile

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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 mainline changes.

File:

• uspace/srv/hid/console/Makefile (modified) (1 diff)

uspace/srv/hid/console/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../../..
+LIBS = $(LIBFB_PREFIX)/libfb.a
+EXTRA_CFLAGS += -I$(LIBFB_PREFIX)
 BINARY = console
 
-GENERIC_SOURCES = \
+SOURCES = \
         console.c \
-        keybuffer.c \
-        gcons.c
+        images.c
 
 IMAGES = \
-        gfx/helenos.ppm \
-        gfx/nameic.ppm \
-        gfx/cons_selected.ppm \
-        gfx/cons_idle.ppm \
-        gfx/cons_has_data.ppm \
-        gfx/cons_kernel.ppm \
-        gfx/anim_1.ppm \
-        gfx/anim_2.ppm \
-        gfx/anim_3.ppm \
-        gfx/anim_4.ppm
+        gfx/helenos.tga \
+        gfx/nameic.tga \
+        gfx/cons_data.tga \
+        gfx/cons_dis.tga \
+        gfx/cons_dis_sel.tga \
+        gfx/cons_idle.tga \
+        gfx/cons_sel.tga \
+        gfx/cons_kernel.tga \
+        gfx/anim_1.tga \
+        gfx/anim_2.tga \
+        gfx/anim_3.tga \
+        gfx/anim_4.tga
 
-SOURCES = \
-        $(GENERIC_SOURCES) \
-        $(IMAGES)
+PRE_DEPEND = images.c images.h
+EXTRA_CLEAN = images.c images.h
 
 include $(USPACE_PREFIX)/Makefile.common
 
-%.o: %.ppm
-        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@
+images.c images.h: $(IMAGES)
+        $(ROOT_PATH)/tools/mkarray.py images CONSOLE_IMAGES $^