Changeset 7eaeec1 in mainline for uspace/srv/hid/output/Makefile

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/output/Makefile (moved) (moved from uspace/srv/hid/fb/Makefile ) (1 diff)

uspace/srv/hid/output/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBFB_PREFIX)/libfb.a
-EXTRA_CFLAGS += -I$(LIBFB_PREFIX)
-BINARY = fb
+BINARY = output
 
 SOURCES = \
-        gfx/font-8x16.c \
         ctl/serial.c \
         port/ega.c \
-        port/kfb.c \
         port/kchar.c \
         port/niagara.c \
         port/ski.c \
         proto/vt100.c \
-        fb.c
+        output.c
 
 include $(USPACE_PREFIX)/Makefile.common