From 7f29fdf9e5504a6fbd496119126db2de39aabf2c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 9 Mar 2023 22:37:07 +0100 Subject: [PATCH] yWeb: own Makefile for data/y-web/images/rc Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6eed1eaf34d474f11c9753887c548583759f60b6 Author: vanhofen Date: 2023-03-09 (Thu, 09 Mar 2023) Origin message was: ------------------ - yWeb: own Makefile for data/y-web/images/rc ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 1 + data/y-web/images/Makefile.am | 37 ++++++-------------------------- data/y-web/images/rc/Makefile.am | 25 +++++++++++++++++++++ data/y-web/styles/Makefile.am | 2 +- 4 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 data/y-web/images/rc/Makefile.am diff --git a/configure.ac b/configure.ac index 634908e95..d6ad7409c 100644 --- a/configure.ac +++ b/configure.ac @@ -612,6 +612,7 @@ data/webtv/Makefile data/y-web/Makefile data/y-web/favicon/Makefile data/y-web/images/Makefile +data/y-web/images/rc/Makefile data/y-web/info/Makefile data/y-web/jquery/Makefile data/y-web/languages/Makefile diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index db3d9c23b..951a1cad3 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -1,6 +1,8 @@ -imagesdir = $(PRIVATE_HTTPDDIR)/images +SUBDIRS = rc -images_DATA = \ +installdir = $(PRIVATE_HTTPDDIR)/images + +install_DATA = \ accept.png \ alert.gif \ arrowdown.png \ @@ -60,7 +62,7 @@ images_DATA = \ zap.png # file manager -images_DATA += \ +install_DATA += \ chmod.png \ copy.gif \ cut.png \ @@ -81,7 +83,7 @@ images_DATA += \ work.gif # extensions -images_DATA += \ +install_DATA += \ ext_add.png \ ext_delete.png \ ext_edit.png \ @@ -92,30 +94,3 @@ images_DATA += \ ext_normal.png \ ext_plugin.png \ ext_script.png - -# remote controls -imagesrcdir = $(PRIVATE_HTTPDDIR)/images/rc - -imagesrc_DATA = \ - rc/rc_cst_v1.jpg \ - rc/rc_cst_v2.png \ - rc/rc_cst_v3.png \ - rc/rc_cst_v4.png \ - rc/rc_cst_v5.png \ - rc/rc_cst_v6.png \ - rc/rc_dbox_nokia_old.png \ - rc/rc_dbox_philips.png - -if ! BOXTYPE_CST -imagesrc_DATA += \ - rc/rc_ax_hd51.png \ - rc/rc_ax_hd61.png \ - rc/rc_axas_e4hd.png \ - rc/rc_mutant_hd51.png \ - rc/rc_mutant_hd60.png \ - rc/rc_osmio4k.png \ - rc/rc_protek_4k_uhd.png \ - rc/rc_vuplus.png \ - rc/rc_wwio_bre2ze4k.png \ - rc/rc_zgemma_h7.png -endif diff --git a/data/y-web/images/rc/Makefile.am b/data/y-web/images/rc/Makefile.am new file mode 100644 index 000000000..a3f91cf0b --- /dev/null +++ b/data/y-web/images/rc/Makefile.am @@ -0,0 +1,25 @@ +installdir = $(PRIVATE_HTTPDDIR)/images/rc + +install_DATA = \ + rc_cst_v1.jpg \ + rc_cst_v2.png \ + rc_cst_v3.png \ + rc_cst_v4.png \ + rc_cst_v5.png \ + rc_cst_v6.png \ + rc_dbox_nokia_old.png \ + rc_dbox_philips.png + +if ! BOXTYPE_CST +install_DATA += \ + rc_ax_hd51.png \ + rc_ax_hd61.png \ + rc_axas_e4hd.png \ + rc_mutant_hd51.png \ + rc_mutant_hd60.png \ + rc_osmio4k.png \ + rc_protek_4k_uhd.png \ + rc_vuplus.png \ + rc_wwio_bre2ze4k.png \ + rc_zgemma_h7.png +endif diff --git a/data/y-web/styles/Makefile.am b/data/y-web/styles/Makefile.am index b0ac3866d..28ef947f0 100644 --- a/data/y-web/styles/Makefile.am +++ b/data/y-web/styles/Makefile.am @@ -3,4 +3,4 @@ installdir = $(PRIVATE_HTTPDDIR)/styles install_DATA = \ Y_Dist-GreyBlue.css \ Y_Dist-NI_dark.css \ - Y_Dist-Tuxbox.css \ + Y_Dist-Tuxbox.css