Changeset 8ff0bd2 in mainline for uspace/srv/hid/fb/Makefile

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/fb/Makefile (modified) (2 diffs)

uspace/srv/hid/fb/Makefile

@@ -40 +40 @@
 
 SOURCES = \
-        main.c \
-        ppm.c
+        main.c
 
 ifneq ($(UARCH),ia64)
@@ -84 +83 @@
                 EXTRA_CFLAGS += -DNIAGARA_ENABLED
         endif
-        
-        ifeq ($(MACHINE),serengeti)
-                SOURCES += \
-                        sgcn.c \
-                        serial_console.c
-                EXTRA_CFLAGS += -DSGCN_ENABLED
-        endif
 endif
 
-EXTRA_CFLAGS += -D$(UARCH)
+LIBS = $(LIBIMGMAP_PREFIX)/libimgmap.a
+EXTRA_CFLAGS += -I$(LIBIMGMAP_PREFIX) -D$(UARCH)
 
 include $(USPACE_PREFIX)/Makefile.common