]> git.sesse.net Git - vlc/blobdiff - share/Makefile.am
Fix memleak in lua module.
[vlc] / share / Makefile.am
index 5d69a9485569e01330bf7b39b03fd91b2ba7d490..6e5a767a6e5492f97cc2a7ed53c83cf2f0cd5418 100644 (file)
@@ -1,20 +1,24 @@
-EXTRA_DIST = $(DIST_rsrc) \
-       $(skins2_default_vlt_FILES)
 MOSTLYCLEANFILES = $(nobase_pkgdata_DATA) 
 
 pkgdatadir = $(datadir)/vlc
 
+nobase_dist_data_DATA = applications/vlc.desktop
+
 dist_pkgdata_DATA = \
-       $(DIST_pda) \
        $(DIST_icons16) \
        $(DIST_icons32) \
        $(DIST_icons48) \
        $(DIST_icons128)
-
 nobase_dist_pkgdata_DATA = \
        utils/gnome-vlc-default.sh \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(DIST_rsrc) \
+       $(DIST_pda) \
+       $(skins2_default_vlt_FILES) \
        $(DIST_skins2) \
        $(DIST_http) \
        $(DIST_http_lua) \
@@ -24,9 +28,32 @@ nobase_dist_pkgdata_DATA = \
        $(DIST_osdmenu_minimal) \
        $(DIST_mozilla)
 
+if BUILD_SKINS
 nobase_pkgdata_DATA = skins2/default.vlt
-nobase_dist_data_DATA = applications/vlc.desktop
-
+nobase_dist_pkgdata_DATA += $(DIST_skins2)
+endif
+if BUILD_PDA
+nobase_dist_pkgdata_DATA += $(DIST_pda)
+endif
+if BUILD_HTTPD
+nobase_dist_pkgdata_DATA += $(DIST_http)
+endif
+if BUILD_OSDMENU
+nobase_dist_pkgdata_DATA += \
+       $(DIST_osdmenu_default) \
+       $(DIST_osdmenu_dvd) \
+       $(DIST_osdmenu_minimal)
+endif
+if BUILD_LUA
+nobase_dist_pkgdata_DATA += $(DIST_lua)
+if BUILD_HTTPD
+nobase_dist_pkgdata_DATA += $(DIST_http_lua)
+endif
+endif
+if BUILD_MOZILLA
+# TODO: move to the mozilla directory
+nobase_dist_pkgdata_DATA += $(DIST_mozilla)
+endif
 
 DIST_rsrc = \
        newres.h \
@@ -255,6 +282,7 @@ DIST_lua= \
        lua/playlist/appletrailers.lua \
        lua/playlist/break.lua \
        lua/playlist/dailymotion.lua \
+       lua/playlist/france2.lua \
        lua/playlist/joox.lua \
        lua/playlist/lelombrik.lua \
        lua/playlist/youtube.lua \
@@ -267,93 +295,76 @@ DIST_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
 
 DIST_http_lua = \
-       http-lua/.hosts \
-       http-lua/custom.lua \
-       http-lua/dialogs/.hosts \
-       http-lua/dialogs/browse \
-       http-lua/dialogs/footer \
-       http-lua/dialogs/input \
-       http-lua/dialogs/main \
-       http-lua/dialogs/mosaic \
-       http-lua/dialogs/playlist \
-       http-lua/dialogs/sout \
-       http-lua/dialogs/vlm \
-       http-lua/favicon.ico \
-       http-lua/images/delete.png \
-       http-lua/images/delete_small.png \
-       http-lua/images/eject.png \
-       http-lua/images/empty.png \
-       http-lua/images/fullscreen.png \
-       http-lua/images/help.png \
-       http-lua/images/info.png \
-       http-lua/images/loop.png \
-       http-lua/images/minus.png \
-       http-lua/images/next.png \
-       http-lua/images/pause.png \
-       http-lua/images/play.png \
-       http-lua/images/playlist.png \
-       http-lua/images/playlist_small.png \
-       http-lua/images/plus.png \
-       http-lua/images/prev.png \
-       http-lua/images/refresh.png \
-       http-lua/images/repeat.png \
-       http-lua/images/reset.png \
-       http-lua/images/sd.png \
-       http-lua/images/shuffle.png \
-       http-lua/images/slider_bar.png \
-       http-lua/images/slider_left.png \
-       http-lua/images/slider_point.png \
-       http-lua/images/slider_right.png \
-       http-lua/images/snapshot.png \
-       http-lua/images/slow.png \
-       http-lua/images/sort.png \
-       http-lua/images/sout.png \
-       http-lua/images/speaker.png \
-       http-lua/images/speaker_mute.png \
-       http-lua/images/stop.png \
-       http-lua/images/vlc16x16.png \
-       http-lua/images/volume_down.png \
-       http-lua/images/volume_up.png \
-       http-lua/images/white.png \
-       http-lua/images/white_cross_small.png \
-       http-lua/index.html \
-       http-lua/js/functions.js \
-       http-lua/js/mosaic.js \
-       http-lua/js/vlm.js \
-       http-lua/mosaic.html \
-       http-lua/old/.hosts \
-       http-lua/old/admin/.access \
-       http-lua/old/admin/browse.html \
-       http-lua/old/admin/dboxfiles.html \
-       http-lua/old/admin/index.html \
-       http-lua/old/cone_minus.png \
-       http-lua/old/cone_plus.png \
-       http-lua/old/index.html \
-       http-lua/old/info.html \
-       http-lua/old/style.css \
-       http-lua/old/vlm/edit.html \
-       http-lua/old/vlm/index.html \
-       http-lua/old/vlm/new.html \
-       http-lua/old/vlm/show.html \
-       http-lua/old/webcam.html \
-       http-lua/requests/browse.xml \
-       http-lua/requests/playlist.xml \
-       http-lua/requests/status.xml \
-       http-lua/requests/vlm.xml \
-       http-lua/requests/vlm_cmd.xml \
-       http-lua/requests/readme \
-       http-lua/style.css \
-       http-lua/iehacks.css \
-       http-lua/vlm.html \
-       http-lua/vlm_export.html \
-       http-lua/flash.html
+       lua/http/.hosts \
+       lua/http/custom.lua \
+       lua/http/dialogs/.hosts \
+       lua/http/dialogs/browse \
+       lua/http/dialogs/footer \
+       lua/http/dialogs/input \
+       lua/http/dialogs/main \
+       lua/http/dialogs/mosaic \
+       lua/http/dialogs/playlist \
+       lua/http/dialogs/sout \
+       lua/http/dialogs/vlm \
+       lua/http/favicon.ico \
+       lua/http/images/delete.png \
+       lua/http/images/delete_small.png \
+       lua/http/images/eject.png \
+       lua/http/images/empty.png \
+       lua/http/images/fullscreen.png \
+       lua/http/images/help.png \
+       lua/http/images/info.png \
+       lua/http/images/loop.png \
+       lua/http/images/minus.png \
+       lua/http/images/next.png \
+       lua/http/images/pause.png \
+       lua/http/images/play.png \
+       lua/http/images/playlist.png \
+       lua/http/images/playlist_small.png \
+       lua/http/images/plus.png \
+       lua/http/images/prev.png \
+       lua/http/images/refresh.png \
+       lua/http/images/repeat.png \
+       lua/http/images/reset.png \
+       lua/http/images/sd.png \
+       lua/http/images/shuffle.png \
+       lua/http/images/slider_bar.png \
+       lua/http/images/slider_left.png \
+       lua/http/images/slider_point.png \
+       lua/http/images/slider_right.png \
+       lua/http/images/snapshot.png \
+       lua/http/images/slow.png \
+       lua/http/images/sort.png \
+       lua/http/images/sout.png \
+       lua/http/images/speaker.png \
+       lua/http/images/speaker_mute.png \
+       lua/http/images/stop.png \
+       lua/http/images/vlc16x16.png \
+       lua/http/images/volume_down.png \
+       lua/http/images/volume_up.png \
+       lua/http/images/white.png \
+       lua/http/images/white_cross_small.png \
+       lua/http/index.html \
+       lua/http/js/functions.js \
+       lua/http/js/mosaic.js \
+       lua/http/js/vlm.js \
+       lua/http/mosaic.html \
+       lua/http/requests/browse.xml \
+       lua/http/requests/playlist.xml \
+       lua/http/requests/status.xml \
+       lua/http/requests/vlm.xml \
+       lua/http/requests/vlm_cmd.xml \
+       lua/http/requests/readme \
+       lua/http/style.css \
+       lua/http/iehacks.css \
+       lua/http/vlm.html \
+       lua/http/vlm_export.html \
+       lua/http/flash.html
 
 DIST_mozilla = \
        mozilla/fullscreen.xpm \