From 3dbd82cf4db68785afeda17b8eee7f87c7d80dd7 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 18 Aug 2009 17:16:07 +0200 Subject: [PATCH] do not use wildcards, because it breaks builds outside the source directory and therefore breaks 'make distcheck' --- data/Makefile.am | 15 ++++- data/countries/Makefile.am | 31 ++++++++++- data/defaults/Dream/Makefile.am | 13 ++++- data/extensions/Makefile.am | 5 +- data/fonts/Makefile.am | 5 +- data/skin_default/Makefile.am | 64 +++++++++++++++++++++- data/skin_default/buttons/Makefile.am | 32 ++++++++++- data/skin_default/icons/Makefile.am | 48 +++++++++++++++- data/skin_default/menu/Makefile.am | 10 +++- data/skin_default/spinner/Makefile.am | 5 +- lib/python/Plugins/Extensions/DVDBurn/Makefile.am | 22 +++++++- .../SystemPlugins/SoftwareManager/Makefile.am | 17 ++++-- .../Plugins/SystemPlugins/Videomode/Makefile.am | 14 +++-- 13 files changed, 257 insertions(+), 24 deletions(-) mode change 100755 => 100644 lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am diff --git a/data/Makefile.am b/data/Makefile.am index 926eff6..84a5989 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,17 @@ SUBDIRS = countries fonts defaults extensions skin_default dist_pkgdata_DATA = \ - *.xml *.png encoding.conf radio.mvi + defaultsatlists.xml \ + defaultwizard.xml \ + dreampackagewizard.xml \ + encoding.conf \ + keymap.xml \ + menu.xml \ + prev.png \ + radio.mvi \ + rcpositions.xml \ + setup.xml \ + skin_default.xml \ + skin.xml \ + startwizard.xml \ + tutorialwizard.xml diff --git a/data/countries/Makefile.am b/data/countries/Makefile.am index 58c6d01..c40315d 100644 --- a/data/countries/Makefile.am +++ b/data/countries/Makefile.am @@ -1,4 +1,33 @@ installdir = $(pkgdatadir)/countries dist_install_DATA = \ - *.png + ad.png \ + ae.png \ + cz.png \ + de.png \ + dk.png \ + en.png \ + es.png \ + fi.png \ + fr.png \ + gr.png \ + hr.png \ + hu.png \ + is.png \ + it.png \ + lt.png \ + lv.png \ + missing.png \ + nl.png \ + no.png \ + pl.png \ + pt.png \ + ro.png \ + ru.png \ + se.png \ + si.png \ + sk.png \ + tr.png \ + ua.png \ + x-fy.png \ + yu.png diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am index 2890d86..113442c 100644 --- a/data/defaults/Dream/Makefile.am +++ b/data/defaults/Dream/Makefile.am @@ -1,6 +1,13 @@ installdir = $(pkgdatadir)/defaults/Dream dist_install_DATA = \ - *.info \ - userbouquet.favourites.tv bouquets.tv \ - settings.7025 settings.800 settings.8000 + bouquets.tv \ + dm500hd.info \ + dm7025.info \ + dm8000.info \ + dm800.info \ + settings.500hd \ + settings.7025 \ + settings.800 \ + settings.8000 \ + userbouquet.favourites.tv diff --git a/data/extensions/Makefile.am b/data/extensions/Makefile.am index 1109c59..c142de3 100644 --- a/data/extensions/Makefile.am +++ b/data/extensions/Makefile.am @@ -1,4 +1,7 @@ installdir = $(pkgdatadir)/extensions dist_install_DATA = \ - *.png + directory.png \ + movie.png \ + music.png \ + picture.png diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index d3c0753..f743b8c 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -1,4 +1,7 @@ installdir = $(FONTDIR) dist_install_DATA = \ - *.ttf + ae_AlMateen.ttf \ + lcd.ttf \ + md_khmurabi_10.ttf \ + nmsbd.ttf diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am index d90756d..e2d2abc 100644 --- a/data/skin_default/Makefile.am +++ b/data/skin_default/Makefile.am @@ -3,4 +3,66 @@ SUBDIRS = menu icons buttons spinner installdir = $(pkgdatadir)/skin_default dist_install_DATA = \ - *.png + arrowdown.png \ + arrowup.png \ + bar_ber.png \ + bar_snr.png \ + b_bl.png \ + b_b.png \ + b_br.png \ + b_l.png \ + border_epg.png \ + border_eventinfo.png \ + border_info.png \ + border_menu_300.png \ + border_menu.png \ + border_multiepg.png \ + bottombar.png \ + b_r.png \ + b_tl.png \ + b_t.png \ + b_tr.png \ + div-h.png \ + div-v.png \ + epg_more.png \ + epg_next.png \ + epg_now.png \ + expandable-plugins.png \ + expanded-plugins.png \ + info-bg_mp.png \ + info-bg.png \ + mediaplayer_bg.png \ + mute.png \ + nim_active.png \ + no_coverArt.png \ + pal.png \ + picon_default.png \ + position_arrow.png \ + position_pointer.png \ + progress_bg.png \ + progress_big.png \ + progress_medium.png \ + progress_small.png \ + rcold.png \ + rc.png \ + screws_mp.png \ + screws.png \ + sleeptimer.png \ + timeline-now.png \ + timeline.png \ + verticalline-plugins.png \ + vkey_backspace.png \ + vkey_bg.png \ + vkey_clr.png \ + vkey_esc.png \ + vkey_icon.png \ + vkey_left.png \ + vkey_ok.png \ + vkey_right.png \ + vkey_sel.png \ + vkey_shift.png \ + vkey_shift_sel.png \ + vkey_space.png \ + vkey_text.png \ + volume.png \ + wizard.png diff --git a/data/skin_default/buttons/Makefile.am b/data/skin_default/buttons/Makefile.am index 0ed0d58..e47bbfb 100644 --- a/data/skin_default/buttons/Makefile.am +++ b/data/skin_default/buttons/Makefile.am @@ -1,4 +1,34 @@ installdir = $(pkgdatadir)/skin_default/buttons dist_install_DATA = \ - *.png + blue.png \ + blue_pressed.png \ + button_blue_off.png \ + button_blue.png \ + button_green_off.png \ + button_green.png \ + button_red_off.png \ + button_red.png \ + button_yellow_off.png \ + button_yellow.png \ + green-big.png \ + green.png \ + key_0.png \ + key_1.png \ + key_2.png \ + key_3.png \ + key_4.png \ + key_5.png \ + key_6.png \ + key_7.png \ + key_8.png \ + key_9.png \ + key_blue.png \ + key_green.png \ + key_info.png \ + key_menu.png \ + key_red.png \ + key_yellow.png \ + red-big.png \ + red.png \ + yellow.png diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am index cf4ddc2..8e2052b 100644 --- a/data/skin_default/icons/Makefile.am +++ b/data/skin_default/icons/Makefile.am @@ -1,4 +1,50 @@ installdir = $(pkgdatadir)/skin_default/icons dist_install_DATA = \ - *.png + clock.png \ + dish.png \ + dish_scan.png \ + dmm_logo.png \ + epgclock_add.png \ + epgclock.png \ + epgclock_post.png \ + epgclock_pre.png \ + epgclock_prepost.png \ + folder.png \ + ico_mp_forward.png \ + ico_mp_pause.png \ + ico_mp_play.png \ + ico_mp_rewind.png \ + ico_mp_stop.png \ + icon_crypt.png \ + icon_dolby.png \ + icon_event.png \ + icon_format.png \ + icon_rec_off.png \ + icon_rec.png \ + icons_off.png \ + icon_txt.png \ + icon_view.png \ + input_error.png \ + input_info.png \ + input_question.png \ + lock_error.png \ + lock_off.png \ + lock_on.png \ + lock.png \ + marker.png \ + mp_buttons.png \ + plugin.png \ + rass_logo.png \ + rass_page1.png \ + rass_page2.png \ + rass_page3.png \ + rass_page4.png \ + record.png \ + redx.png \ + repeat_off.png \ + repeat_on.png \ + scan-c.png \ + scan-s.png \ + scan-t.png \ + selectioncross.png diff --git a/data/skin_default/menu/Makefile.am b/data/skin_default/menu/Makefile.am index 21f19a7..3b57b59 100644 --- a/data/skin_default/menu/Makefile.am +++ b/data/skin_default/menu/Makefile.am @@ -1,4 +1,12 @@ installdir = $(pkgdatadir)/skin_default/menu dist_install_DATA = \ - *.png + dvd_player.png \ + information.png \ + media_player.png \ + plugins.png \ + scart.png \ + setup.png \ + shutdown.png \ + subtitles.png \ + timer.png diff --git a/data/skin_default/spinner/Makefile.am b/data/skin_default/spinner/Makefile.am index ba40da0..0374a24 100644 --- a/data/skin_default/spinner/Makefile.am +++ b/data/skin_default/spinner/Makefile.am @@ -1,4 +1,7 @@ installdir = $(pkgdatadir)/skin_default/spinner dist_install_DATA = \ - *.png + wait1.png \ + wait2.png \ + wait3.png \ + wait4.png diff --git a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am index 76a8ce2..5f3749b 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am @@ -3,9 +3,25 @@ installdir = $(pkglibdir)/python/Plugins/Extensions/DVDBurn SUBDIRS = meta install_PYTHON = \ + DVDProject.py \ + DVDTitle.py \ + DVDToolbox.py \ __init__.py \ plugin.py \ - DVDProject.py DVDTitle.py TitleCutter.py TitleList.py TitleProperties.py Process.py ProjectSettings.py DVDToolbox.py - -dist_install_DATA = *.xml *.jpg *.mpg *.mp2 *.png + Process.py \ + ProjectSettings.py \ + TitleCutter.py \ + TitleList.py \ + TitleProperties.py +dist_install_DATA = \ + DreamboxDVD.ddvdp.xml \ + dreamdvd_boat.jpg \ + dreamdvd_clouds.jpg \ + dvdburn.png \ + keymap.xml \ + silence.mp2 \ + Text_menu_boat.ddvdm.xml \ + Thumbs_menu_clouds.ddvdm.xml \ + vmgmblank.mpg \ + vmgmdream.mpg diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am old mode 100755 new mode 100644 index b8f38c4..ee1e56d --- a/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am +++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am @@ -6,9 +6,16 @@ install_PYTHON = \ __init__.py \ plugin.py \ BackupRestore.py \ - ImageWizard.py \ - imagewizard.xml \ - *.png + ImageWizard.py -dist_install_DATA = LICENSE - +dist_install_DATA = \ + imagewizard.xml \ + installable.png \ + installed.png \ + install.png \ + LICENSE \ + noprev.png \ + remove.png \ + update.png \ + upgradeable.png \ + upgrade.png diff --git a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am index 830889d..2ec0b33 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am +++ b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am @@ -6,8 +6,14 @@ install_PYTHON = \ __init__.py \ plugin.py \ VideoHardware.py \ - VideoWizard.py \ - videowizard.xml \ - *.png + VideoWizard.py -dist_install_DATA = LICENSE +dist_install_DATA = \ + DVI.png \ + lcd_DVI.png \ + lcd_Scart.png \ + lcd_YPbPr.png \ + LICENSE \ + Scart.png \ + videowizard.xml \ + YPbPr.png -- 2.7.4