dbus: simplify single instance initialization

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 0794c7f00196d0c64b2c5b56f6171da332e03cf1..0c6b76f4eb8bd34fcf738eee89d3b1a05aec967b 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -4,10 +4,8 @@ EXTRA_DIST =
 
 appdatadir = $(datadir)/applications
 if !HAVE_WIN32
-if !HAVE_WINCE
 appdata_DATA = vlc.desktop
 endif
-endif
 EXTRA_DIST += vlc.desktop.in
 CLEANFILES += $(appdata_DATA)
 
@@ -24,7 +22,6 @@ icons128dir = $(iconsdatadir)/128x128/apps
 icons256dir = $(iconsdatadir)/256x256/apps
 
 if !HAVE_WIN32
-if !HAVE_WINCE
 dist_vlcdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
@@ -39,17 +36,16 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/video-vlc-default.sh \
        $(NULL)
 endif
-endif
 
 EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
        $(DIST_rsrc) \
        $(DIST_skins2) \
+       $(DIST_icons) \
        $(DIST_http_lua) \
        $(DIST_lua) \
        osdmenu/default.cfg.in \
        $(DIST_osdmenu_default) \
-       $(DIST_maemo) \
        $(DIST_solid)
 CLEANFILES += osdmenu/default.cfg
 
@@ -63,9 +59,6 @@ nobase_vlcdata_DATA += \
        osdmenu/default.cfg \
        $(DIST_osdmenu_default)
 endif
-if BUILD_HILDON
-nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
-endif
 if KDE_SOLID
 soliddata_DATA = $(DIST_solid)
 endif
@@ -79,6 +72,10 @@ DIST_rsrc = \
        resource.h \
        vlc_wince_rc.rc
 
+DIST_icons = \
+       vlc48x48.ico \
+       vlc512x512.png
+
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
        skins2/fonts/FreeSansBold.ttf \
@@ -283,7 +280,6 @@ DIST_http_lua = \
        lua/http/dialogs/batch_window.html \
        lua/http/dialogs/error_window.html \
        lua/http/dialogs/browse_window.html \
-       lua/http/dialogs/.hosts \
        lua/http/dialogs/stream_window.html \
        lua/http/dialogs/offset_window.html \
        lua/http/dialogs/stream_config_window.html \
@@ -346,7 +342,6 @@ DIST_http_lua = \
        lua/http/mobile_browse.html \
        lua/http/favicon.ico \
        lua/http/mobile_view.html \
-       lua/http/.hosts \
        lua/http/requests/playlist.xml \
        lua/http/requests/playlist.json \
        lua/http/requests/README.txt \
@@ -385,20 +380,6 @@ DIST_http_lua = \
        lua/http/js/jquery-ui-1.8.13.custom.min.js \
        lua/http/old/style.css
 
-DIST_maemo = \
-       maemo/vlc_intf.rc \
-       maemo/vlc_left_tab_active.png \
-       maemo/vlc_left_tab_passive.png \
-       maemo/playlist.png \
-       maemo/play.png \
-       maemo/pause.png \
-       maemo/stop.png \
-       maemo/previous.png \
-       maemo/next.png
-
-maemo_FILES = \
-       icons/32x32/vlc.png
-
 DIST_solid = \
        solid/vlc-opencda.desktop \
        solid/vlc-opendvd.desktop \