From c262680c9375940fbd2c1ebf97a15843422a2ede Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 10 Jun 2010 20:40:12 +0200 Subject: Move non-C files from src to data, simplify Makefile while at it --- Makefile | 22 ++++++---------------- data/fonts/black.style | 4 ++++ data/fonts/menu.style | 4 ++++ data/fonts/yudit.ttf | Bin 0 -> 57708 bytes data/images/about.png | Bin 0 -> 61171 bytes data/images/menubg_aluminium.png | Bin 0 -> 1862 bytes data/images/menubg_aqua.png | Bin 0 -> 5325 bytes data/images/menubg_black.png | Bin 0 -> 1716 bytes data/images/menubg_brushed.png | Bin 0 -> 8649 bytes data/images/menubg_chrome.png | Bin 0 -> 10995 bytes data/images/menubg_default.png | Bin 0 -> 209 bytes data/images/menubg_pastel.png | Bin 0 -> 3676 bytes data/images/menubg_sky.png | Bin 0 -> 1928 bytes data/images/menubg_wood.png | Bin 0 -> 7873 bytes src/about.png | Bin 61171 -> 0 bytes src/menubg_aluminium.png | Bin 1862 -> 0 bytes src/menubg_aqua.png | Bin 5325 -> 0 bytes src/menubg_black.png | Bin 1716 -> 0 bytes src/menubg_brushed.png | Bin 8649 -> 0 bytes src/menubg_chrome.png | Bin 10995 -> 0 bytes src/menubg_default.png | Bin 209 -> 0 bytes src/menubg_pastel.png | Bin 3676 -> 0 bytes src/menubg_sky.png | Bin 1928 -> 0 bytes src/menubg_wood.png | Bin 7873 -> 0 bytes src/ttfonts/black.style | 4 ---- src/ttfonts/menu.style | 4 ---- src/ttfonts/yudit.ttf | Bin 57708 -> 0 bytes 27 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 data/fonts/black.style create mode 100644 data/fonts/menu.style create mode 100644 data/fonts/yudit.ttf create mode 100644 data/images/about.png create mode 100644 data/images/menubg_aluminium.png create mode 100644 data/images/menubg_aqua.png create mode 100644 data/images/menubg_black.png create mode 100644 data/images/menubg_brushed.png create mode 100644 data/images/menubg_chrome.png create mode 100644 data/images/menubg_default.png create mode 100644 data/images/menubg_pastel.png create mode 100644 data/images/menubg_sky.png create mode 100644 data/images/menubg_wood.png delete mode 100644 src/about.png delete mode 100644 src/menubg_aluminium.png delete mode 100644 src/menubg_aqua.png delete mode 100644 src/menubg_black.png delete mode 100644 src/menubg_brushed.png delete mode 100644 src/menubg_chrome.png delete mode 100644 src/menubg_default.png delete mode 100644 src/menubg_pastel.png delete mode 100644 src/menubg_sky.png delete mode 100644 src/menubg_wood.png delete mode 100644 src/ttfonts/black.style delete mode 100644 src/ttfonts/menu.style delete mode 100644 src/ttfonts/yudit.ttf 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/data/fonts/black.style b/data/fonts/black.style new file mode 100644 index 0000000..d2a86a9 --- /dev/null +++ b/data/fonts/black.style @@ -0,0 +1,4 @@ +#Style +#NAME Menu +255 255 255 64 2 2 +255 255 255 255 0 0 diff --git a/data/fonts/menu.style b/data/fonts/menu.style new file mode 100644 index 0000000..8557360 --- /dev/null +++ b/data/fonts/menu.style @@ -0,0 +1,4 @@ +#Style +#NAME Menu +0 0 0 64 2 2 +0 0 0 0 0 0 diff --git a/data/fonts/yudit.ttf b/data/fonts/yudit.ttf new file mode 100644 index 0000000..8099e63 Binary files /dev/null and b/data/fonts/yudit.ttf differ diff --git a/data/images/about.png b/data/images/about.png new file mode 100644 index 0000000..5aaaf17 Binary files /dev/null and b/data/images/about.png differ diff --git a/data/images/menubg_aluminium.png b/data/images/menubg_aluminium.png new file mode 100644 index 0000000..eed00f1 Binary files /dev/null and b/data/images/menubg_aluminium.png differ diff --git a/data/images/menubg_aqua.png b/data/images/menubg_aqua.png new file mode 100644 index 0000000..3a72590 Binary files /dev/null and b/data/images/menubg_aqua.png differ diff --git a/data/images/menubg_black.png b/data/images/menubg_black.png new file mode 100644 index 0000000..08b4c2b Binary files /dev/null and b/data/images/menubg_black.png differ diff --git a/data/images/menubg_brushed.png b/data/images/menubg_brushed.png new file mode 100644 index 0000000..32fad47 Binary files /dev/null and b/data/images/menubg_brushed.png differ diff --git a/data/images/menubg_chrome.png b/data/images/menubg_chrome.png new file mode 100644 index 0000000..24f3025 Binary files /dev/null and b/data/images/menubg_chrome.png differ diff --git a/data/images/menubg_default.png b/data/images/menubg_default.png new file mode 100644 index 0000000..dd21188 Binary files /dev/null and b/data/images/menubg_default.png differ diff --git a/data/images/menubg_pastel.png b/data/images/menubg_pastel.png new file mode 100644 index 0000000..ec96566 Binary files /dev/null and b/data/images/menubg_pastel.png differ diff --git a/data/images/menubg_sky.png b/data/images/menubg_sky.png new file mode 100644 index 0000000..e0be8ca Binary files /dev/null and b/data/images/menubg_sky.png differ diff --git a/data/images/menubg_wood.png b/data/images/menubg_wood.png new file mode 100644 index 0000000..4dc7440 Binary files /dev/null and b/data/images/menubg_wood.png differ diff --git a/src/about.png b/src/about.png deleted file mode 100644 index 5aaaf17..0000000 Binary files a/src/about.png and /dev/null differ diff --git a/src/menubg_aluminium.png b/src/menubg_aluminium.png deleted file mode 100644 index eed00f1..0000000 Binary files a/src/menubg_aluminium.png and /dev/null differ diff --git a/src/menubg_aqua.png b/src/menubg_aqua.png deleted file mode 100644 index 3a72590..0000000 Binary files a/src/menubg_aqua.png and /dev/null differ diff --git a/src/menubg_black.png b/src/menubg_black.png deleted file mode 100644 index 08b4c2b..0000000 Binary files a/src/menubg_black.png and /dev/null differ diff --git a/src/menubg_brushed.png b/src/menubg_brushed.png deleted file mode 100644 index 32fad47..0000000 Binary files a/src/menubg_brushed.png and /dev/null differ diff --git a/src/menubg_chrome.png b/src/menubg_chrome.png deleted file mode 100644 index 24f3025..0000000 Binary files a/src/menubg_chrome.png and /dev/null differ diff --git a/src/menubg_default.png b/src/menubg_default.png deleted file mode 100644 index dd21188..0000000 Binary files a/src/menubg_default.png and /dev/null differ diff --git a/src/menubg_pastel.png b/src/menubg_pastel.png deleted file mode 100644 index ec96566..0000000 Binary files a/src/menubg_pastel.png and /dev/null differ diff --git a/src/menubg_sky.png b/src/menubg_sky.png deleted file mode 100644 index e0be8ca..0000000 Binary files a/src/menubg_sky.png and /dev/null differ diff --git a/src/menubg_wood.png b/src/menubg_wood.png deleted file mode 100644 index 4dc7440..0000000 Binary files a/src/menubg_wood.png and /dev/null differ diff --git a/src/ttfonts/black.style b/src/ttfonts/black.style deleted file mode 100644 index d2a86a9..0000000 --- a/src/ttfonts/black.style +++ /dev/null @@ -1,4 +0,0 @@ -#Style -#NAME Menu -255 255 255 64 2 2 -255 255 255 255 0 0 diff --git a/src/ttfonts/menu.style b/src/ttfonts/menu.style deleted file mode 100644 index 8557360..0000000 --- a/src/ttfonts/menu.style +++ /dev/null @@ -1,4 +0,0 @@ -#Style -#NAME Menu -0 0 0 64 2 2 -0 0 0 0 0 0 diff --git a/src/ttfonts/yudit.ttf b/src/ttfonts/yudit.ttf deleted file mode 100644 index 8099e63..0000000 Binary files a/src/ttfonts/yudit.ttf and /dev/null differ -- cgit v1.2.3