summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-06-10 20:40:12 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-06-10 20:40:12 +0200
commitc262680c9375940fbd2c1ebf97a15843422a2ede (patch)
treec7d08e466b397352395671a67f5c0db160f0f8f0
parent777ebca319b10ccb33834cd2c1c610819164fbcd (diff)
Move non-C files from src to data, simplify Makefile while at it
-rw-r--r--Makefile22
-rw-r--r--data/fonts/black.style (renamed from src/ttfonts/black.style)0
-rw-r--r--data/fonts/menu.style (renamed from src/ttfonts/menu.style)0
-rw-r--r--data/fonts/yudit.ttf (renamed from src/ttfonts/yudit.ttf)bin57708 -> 57708 bytes
-rw-r--r--data/images/about.png (renamed from src/about.png)bin61171 -> 61171 bytes
-rw-r--r--data/images/menubg_aluminium.png (renamed from src/menubg_aluminium.png)bin1862 -> 1862 bytes
-rw-r--r--data/images/menubg_aqua.png (renamed from src/menubg_aqua.png)bin5325 -> 5325 bytes
-rw-r--r--data/images/menubg_black.png (renamed from src/menubg_black.png)bin1716 -> 1716 bytes
-rw-r--r--data/images/menubg_brushed.png (renamed from src/menubg_brushed.png)bin8649 -> 8649 bytes
-rw-r--r--data/images/menubg_chrome.png (renamed from src/menubg_chrome.png)bin10995 -> 10995 bytes
-rw-r--r--data/images/menubg_default.png (renamed from src/menubg_default.png)bin209 -> 209 bytes
-rw-r--r--data/images/menubg_pastel.png (renamed from src/menubg_pastel.png)bin3676 -> 3676 bytes
-rw-r--r--data/images/menubg_sky.png (renamed from src/menubg_sky.png)bin1928 -> 1928 bytes
-rw-r--r--data/images/menubg_wood.png (renamed from src/menubg_wood.png)bin7873 -> 7873 bytes
14 files changed, 6 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 419a33f..2a88192 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ install: install-man install-doc install-bin install-font install-img
install-man:
@echo installing manuals to ${man_dir}
@mkdir -p ${man_dir}/man1
- @cp man/feh.1 man/feh-cam.1 man/gen-cam-menu.1 ${man_dir}/man1
+ @cp man/* ${man_dir}/man1
@chmod 644 ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1 \
${man_dir}/man1/gen-cam-menu.1
@@ -19,8 +19,7 @@ install-doc:
@echo installing docs to ${doc_dir}
@mkdir -p ${doc_dir}
@cp AUTHORS ChangeLog README TODO ${doc_dir}
- @chmod 644 ${doc_dir}/AUTHORS ${doc_dir}/ChangeLog \
- ${doc_dir}/README ${doc_dir}/TODO
+ @chmod 644 ${doc_dir}/*
install-bin:
@echo installing executables to ${bin_dir}
@@ -32,23 +31,14 @@ install-bin:
install-font:
@echo installing fonts to ${font_dir}
@mkdir -p ${font_dir}
- @cp src/ttfonts/black.style src/ttfonts/menu.style \
- src/ttfonts/yudit.ttf ${font_dir}
- @chmod 644 ${font_dir}/black.style ${font_dir}/menu.style \
- ${font_dir}/yudit.ttf
+ @cp data/fonts/* ${font_dir}
+ @chmod 644 ${font_dir}/*
install-img:
@echo installing images to ${image_dir}
@mkdir -p ${image_dir}
- @cp src/about.png src/menubg_aluminium.png src/menubg_aqua.png \
- src/menubg_black.png src/menubg_brushed.png src/menubg_chrome.png \
- src/menubg_default.png src/menubg_pastel.png src/menubg_sky.png \
- src/menubg_wood.png ${image_dir}
- @chmod 644 ${image_dir}/about.png ${image_dir}/menubg_aluminium.png \
- ${image_dir}/menubg_aqua.png ${image_dir}/menubg_black.png \
- ${image_dir}/menubg_brushed.png ${image_dir}/menubg_chrome.png \
- ${image_dir}/menubg_default.png ${image_dir}/menubg_pastel.png \
- ${image_dir}/menubg_sky.png ${image_dir}/menubg_wood.png
+ @cp data/images/* ${image_dir}
+ @chmod 644 ${image_dir}/*
uninstall:
diff --git a/src/ttfonts/black.style b/data/fonts/black.style
index d2a86a9..d2a86a9 100644
--- a/src/ttfonts/black.style
+++ b/data/fonts/black.style
diff --git a/src/ttfonts/menu.style b/data/fonts/menu.style
index 8557360..8557360 100644
--- a/src/ttfonts/menu.style
+++ b/data/fonts/menu.style
diff --git a/src/ttfonts/yudit.ttf b/data/fonts/yudit.ttf
index 8099e63..8099e63 100644
--- a/src/ttfonts/yudit.ttf
+++ b/data/fonts/yudit.ttf
Binary files differ
diff --git a/src/about.png b/data/images/about.png
index 5aaaf17..5aaaf17 100644
--- a/src/about.png
+++ b/data/images/about.png
Binary files differ
diff --git a/src/menubg_aluminium.png b/data/images/menubg_aluminium.png
index eed00f1..eed00f1 100644
--- a/src/menubg_aluminium.png
+++ b/data/images/menubg_aluminium.png
Binary files differ
diff --git a/src/menubg_aqua.png b/data/images/menubg_aqua.png
index 3a72590..3a72590 100644
--- a/src/menubg_aqua.png
+++ b/data/images/menubg_aqua.png
Binary files differ
diff --git a/src/menubg_black.png b/data/images/menubg_black.png
index 08b4c2b..08b4c2b 100644
--- a/src/menubg_black.png
+++ b/data/images/menubg_black.png
Binary files differ
diff --git a/src/menubg_brushed.png b/data/images/menubg_brushed.png
index 32fad47..32fad47 100644
--- a/src/menubg_brushed.png
+++ b/data/images/menubg_brushed.png
Binary files differ
diff --git a/src/menubg_chrome.png b/data/images/menubg_chrome.png
index 24f3025..24f3025 100644
--- a/src/menubg_chrome.png
+++ b/data/images/menubg_chrome.png
Binary files differ
diff --git a/src/menubg_default.png b/data/images/menubg_default.png
index dd21188..dd21188 100644
--- a/src/menubg_default.png
+++ b/data/images/menubg_default.png
Binary files differ
diff --git a/src/menubg_pastel.png b/data/images/menubg_pastel.png
index ec96566..ec96566 100644
--- a/src/menubg_pastel.png
+++ b/data/images/menubg_pastel.png
Binary files differ
diff --git a/src/menubg_sky.png b/data/images/menubg_sky.png
index e0be8ca..e0be8ca 100644
--- a/src/menubg_sky.png
+++ b/data/images/menubg_sky.png
Binary files differ
diff --git a/src/menubg_wood.png b/data/images/menubg_wood.png
index 4dc7440..4dc7440 100644
--- a/src/menubg_wood.png
+++ b/data/images/menubg_wood.png
Binary files differ