Removal of gnome_main, gnome2_main, gtk_main, gtk2_main, pda modules

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 4d80b2e7e2ad7bd85f4deb29a9aeeb2dd2b2ff8c..02f55cf48188b71f05cda88e441a3a69578c9909 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,4 +1,4 @@
-MOSTLYCLEANFILES = $(nobase_vlcdata_DATA)
+CLEANFILES = skins2/default.vlt
 
 nobase_dist_data_DATA = applications/vlc.desktop
 
@@ -14,12 +14,9 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/video-vlc-default.sh \
        $(NULL)
 
-nobase_dist_vlcdata_DATA = $(NULL)
-
 EXTRA_DIST = \
-       $(DIST_rsrc) \
-       $(DIST_pda) \
        $(skins2_default_vlt_FILES) \
+       $(DIST_rsrc) \
        $(DIST_skins2) \
        $(DIST_http) \
        $(DIST_http_lua) \
@@ -28,32 +25,30 @@ EXTRA_DIST = \
        $(DIST_mozilla) \
        $(DIST_maemo)
 
+nobase_vlcdata_DATA =
 if BUILD_SKINS
-nobase_vlcdata_DATA = skins2/default.vlt
-nobase_dist_vlcdata_DATA += $(DIST_skins2)
-endif
-if BUILD_PDA
-nobase_dist_vlcdata_DATA += $(DIST_pda)
+nobase_vlcdata_DATA += skins2/default.vlt
+nobase_vlcdata_DATA += $(DIST_skins2)
 endif
 if BUILD_HTTPD
-nobase_dist_vlcdata_DATA += $(DIST_http)
+nobase_vlcdata_DATA += $(DIST_http)
 endif
 if BUILD_OSDMENU
-nobase_dist_vlcdata_DATA += \
+nobase_vlcdata_DATA += \
        $(DIST_osdmenu_default)
 endif
 if BUILD_LUA
-nobase_dist_vlcdata_DATA += $(DIST_lua)
+nobase_vlcdata_DATA += $(DIST_lua)
 if BUILD_HTTPD
-nobase_dist_vlcdata_DATA += $(DIST_http_lua)
+nobase_vlcdata_DATA += $(DIST_http_lua)
 endif
 endif
 if BUILD_MOZILLA
 # TODO: move to the mozilla directory
-nobase_dist_vlcdata_DATA += $(DIST_mozilla)
+nobase_vlcdata_DATA += $(DIST_mozilla)
 endif
 if BUILD_MAEMO
-nobase_dist_vlcdata_DATA += $(DIST_maemo)
+nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
 endif
 
 DIST_rsrc = \
@@ -64,16 +59,6 @@ DIST_rsrc = \
        vlc_win32_rc.rc.in \
        libvlc_win32_rc.rc.in
 
-DIST_pda = \
-       pda-forwardb16x16.xpm \
-       pda-openb16x16.xpm \
-       pda-pauseb16x16.xpm \
-       pda-playb16x16.xpm \
-       pda-playlistb16x16.xpm \
-       pda-preferencesb16x16.xpm \
-       pda-rewindb16x16.xpm \
-       pda-stopb16x16.xpm
-
 DIST_icons = vlc.ico
 
 DIST_icons16 = vlc16x16.png vlc16x16.xpm
@@ -221,6 +206,8 @@ DIST_lua= \
        lua/playlist/megavideo.lua \
        lua/playlist/metacafe.lua \
        lua/playlist/googlevideo.lua \
+       lua/playlist/mpora.lua \
+       lua/playlist/vimeo.lua \
        lua/intf/README.txt \
        lua/intf/http.lua \
        lua/intf/rc.lua \
@@ -316,13 +303,7 @@ 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/playlist.png
 
 maemo_FILES = \
        ../modules/gui/qt4/pixmaps/play.png \
@@ -331,7 +312,3 @@ maemo_FILES = \
        ../modules/gui/qt4/pixmaps/previous.png \
        ../modules/gui/qt4/pixmaps/next.png \
        vlc32x32.png
-
-$(DIST_maemo): $(maemo_FILES)
-       mkdir -p maemo
-       cp -r $+ maemo