remove npvlc.dll.manifest and axvlc.dll.manifest while uninstalling

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index e48615b859e4f9195dbea2d8d19933222e7ff7eb..3c1ffb766d2be3c0ef292e21114b371b9623a60a 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -9,12 +9,14 @@ dist_pkgdata_DATA = \
        $(DIST_icons32) \
        $(DIST_icons48) \
        $(DIST_icons128)
-nobase_dist_pkgdata_DATA = \
+nobase_dist_pkgdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
 
+nobase_dist_pkgdata_DATA = $(NULL)
+
 EXTRA_DIST = \
        $(DIST_rsrc) \
        $(DIST_pda) \
@@ -26,7 +28,8 @@ EXTRA_DIST = \
        $(DIST_osdmenu_default) \
        $(DIST_osdmenu_dvd) \
        $(DIST_osdmenu_minimal) \
-       $(DIST_mozilla)
+       $(DIST_mozilla) \
+       $(DIST_maemo)
 
 if BUILD_SKINS
 nobase_pkgdata_DATA = skins2/default.vlt
@@ -54,13 +57,17 @@ if BUILD_MOZILLA
 # TODO: move to the mozilla directory
 nobase_dist_pkgdata_DATA += $(DIST_mozilla)
 endif
+if BUILD_MAEMO
+nobase_dist_pkgdata_DATA += $(DIST_maemo)
+endif
 
 DIST_rsrc = \
        newres.h \
        resource.h \
        vlc_wince_rc.rc \
        vlc_beos.rsrc \
-       vlc_win32_rc.rc
+       vlc_win32_rc.rc.in \
+       libvlc_win32_rc.rc.in
 
 DIST_pda = \
        pda-forwardb16x16.xpm \
@@ -276,8 +283,10 @@ DIST_osdmenu_minimal = \
        osdmenu/minimal/fs_panel_mockup.png
 
 DIST_lua= \
+       lua/README.txt \
        lua/meta/README.txt \
-       lua/meta/googleimage.lua \
+       lua/meta/01_musicbrainz.lua \
+       lua/meta/10_googleimage.lua \
        lua/playlist/README.txt \
        lua/playlist/appletrailers.lua \
        lua/playlist/break.lua \
@@ -290,13 +299,12 @@ DIST_lua= \
        lua/playlist/megavideo.lua \
        lua/playlist/metacafe.lua \
        lua/playlist/googlevideo.lua \
+       lua/intf/README.txt \
        lua/intf/http.lua \
        lua/intf/rc.lua \
        lua/intf/hotkeys.lua \
        lua/intf/modules/common.lua \
        lua/intf/modules/host.lua \
-       lua/intf/modules/httpd.lua \
-       lua/intf/modules/acl.lua \
        lua/intf/modules/sandbox.lua \
        lua/intf/telnet.lua \
        lua/intf/dummy.lua
@@ -381,3 +389,27 @@ DIST_mozilla = \
        mozilla/volume_max.xpm \
        mozilla/volume_mute.xpm \
        mozilla/volume_slider_bar.xpm
+
+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/vlc32x32.png
+
+maemo_FILES = \
+       ../modules/gui/qt4/pixmaps/play.png \
+       ../modules/gui/qt4/pixmaps/pause.png \
+       ../modules/gui/qt4/pixmaps/stop.png \
+       ../modules/gui/qt4/pixmaps/previous.png \
+       ../modules/gui/qt4/pixmaps/next.png \
+       vlc32x32.png
+
+$(DIST_maemo): $(maemo_FILES)
+       mkdir -p maemo
+       cp -r $+ maemo