Changeset 5828554 in mainline for uspace/srv/hid/compositor/Makefile

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/compositor/Makefile (modified) (1 diff)

uspace/srv/hid/compositor/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRAW_PREFIX)/libdraw.a $(LIBSOFTREND_PREFIX)/libsoftrend.a \
-        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-EXTRA_CFLAGS += -I$(LIBDRAW_PREFIX) -I$(LIBSOFTREND_PREFIX)
+LIBS = \
+        $(LIBDRAW_PREFIX)/libdraw.a \
+        $(LIBSOFTREND_PREFIX)/libsoftrend.a \
+        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+
+EXTRA_CFLAGS += \
+        -I$(LIBDRAW_PREFIX) \
+        -I$(LIBSOFTREND_PREFIX) \
+        -I$(LIBDRV_PREFIX)/include
+
 BINARY = compositor
 
 SOURCES = \
-        compositor.c \
-        images.c
-
-IMAGES = \
-        gfx/nameic.tga
-
-PRE_DEPEND = images.c images.h
-EXTRA_CLEAN = images.c images.h
+        compositor.c
 
 include $(USPACE_PREFIX)/Makefile.common
-
-images.c images.h: $(IMAGES)
-        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^