Changeset 95c675b in mainline for uspace/app/barber/Makefile

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/app/barber/Makefile (modified) (2 diffs)

uspace/app/barber/Makefile

@@ -44 +44 @@
 MATH = y
 
+IMG = image
+IMGS = $(IMG)s
+
 SOURCES = \
         barber.c \
-        images.s
+        $(IMGS).s \
+        $(IMGS)_desc.c
 
 IMAGES = \
@@ -80 +84 @@
         gfx/frame30.tga.gz
 
-PRE_DEPEND = images.s images.h
-EXTRA_CLEAN = images.s images.h
+PRE_DEPEND = $(IMGS).s $(IMGS).h $(IMGS)_desc.c
+EXTRA_CLEAN = $(IMGS).s $(IMGS).h $(IMGS)_desc.c $(IMGS).zip
 
 include $(USPACE_PREFIX)/Makefile.common
 
-images.s images.h: $(IMAGES)
-        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES "$(AS_PROLOG)" $^
+$(IMGS).s: $(IMGS).zip
+        unzip -p $< $@ > $@
+
+$(IMGS).h: $(IMGS).zip
+        unzip -p $< $@ > $@
+
+$(IMGS)_desc.c: $(IMGS).zip
+        unzip -p $< $@ > $@
+
+$(IMGS).zip: $(IMAGES)
+        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" .data $^