Update graphics branch

diff --git a/.gitignore b/.gitignore
index a9c24c6288b2ca33440feac770a4f9de2aba7455..b8ef0520816d120b992cc9eb1d6f0018aa596df6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,7 @@ gen/
 obj/
 
 # Leave out cards for now
-res/drawable/card_*.png
-opt/drawable/card_*.svg
+opt/drawable/*.svg
+opt/drawable/*.xcf
+res/drawable/*.png
+res/drawable/*.jpg

diff --git a/makefile b/makefile
index e0a1d30d862e552b2c8b5b0a0b1b52925365132a..6964ec3a317af28345701e9e154a053260938276 100644 (file)
--- a/makefile
+++ b/makefile
@@ -37,13 +37,17 @@ uninstall:
        adb uninstall $(PACKAGE)
        rm bin/install.stamp
 
-png-cards:
-       git checkout cards-png -- 'res/drawable/card_*.png'
-       git reset    HEAD      -- 'res/drawable/card_*.png'
-
-svg-cards:
-       git checkout cards-svg -- 'opt/drawable/card_*.svg'
-       git reset    HEAD      -- 'opt/drawable/card_*.svg'
+graphics:
+       git checkout graphics  --    \
+               'opt/drawable/*.svg' \
+               'opt/drawable/*.xcf' \
+               'res/drawable/*.png' \
+               'res/drawable/*.jpg'
+       git reset HEAD --            \
+               'opt/drawable/*.svg' \
+               'opt/drawable/*.xcf' \
+               'res/drawable/*.png' \
+               'res/drawable/*.jpg'
 
 convert:
        for svg in opt/drawable/*.svg; do        \